ACP2E-3892: [Mainline] Unpopulated pages are cached due to search engine errors

Author: aplapana

app/code/Magento/Elasticsearch/ElasticAdapter/SearchAdapter/Adapter.php

@@ -96,7 +96,7 @@ public function query(RequestInterface $request)
             $rawResponse = $client->query($query);
         } catch (\Exception $e) {
             $this->logger->critical($e);
-            throw new ClientException(__("Could not perform search query."), $e->getCode(), $e);
+            throw new ClientException(__("Could not perform search query."), $e, $e->getCode());
         }
 
         $rawDocuments = isset($rawResponse['hits']['hits']) ? $rawResponse['hits']['hits'] : [];

dev/tests/integration/testsuite/Magento/Elasticsearch/ElasticAdapter/SearchAdapter/AdapterTest.php

@@ -88,7 +88,7 @@ public function testQuery()
         $this->requestBuilder->bind('fulltext_search_query', 'socks');
         $this->requestBuilder->setRequestName('one_match');
         $queryRequest = $this->requestBuilder->create();
-        $exception = new \Exception('Test Message');
+        $exception = new \Exception('Test message.');
         $this->loggerMock->expects($this->once())->method('critical')->with($exception);
         $this->clientMock->expects($this->once())->method('query')->willThrowException($exception);
         $this->expectException(ClientException::class);