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

Author: aplapana

app/code/Magento/AdvancedSearch/Model/Client/ClientException.php

@@ -7,7 +7,9 @@
 
 namespace Magento\AdvancedSearch\Model\Client;
 
-class ClientException extends \Exception
+use Magento\Framework\Exception\LocalizedException;
+
+class ClientException extends LocalizedException
 {
 
 }

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

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

app/code/Magento/Elasticsearch8/SearchAdapter/Adapter.php

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

app/code/Magento/OpenSearch/SearchAdapter/Adapter.php

@@ -138,7 +138,7 @@ public function query(RequestInterface $request) : QueryResponse
             );
         } catch (\Exception $e) {
             $this->logger->critical($e);
-            throw new ClientException($e->getMessage(), $e->getCode(), $e);
+            throw new ClientException(__("Could not perform search query."), $e->getCode(), $e);
         } finally {
             if (isset($pitId)) {
                 $client->closePointInTime(['body' => ['pit_id' => [$pitId]]]);