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

Author: aplapana

app/code/Magento/Catalog/Block/Product/ListProduct.php

@@ -28,7 +28,7 @@
 use Magento\Framework\Url\Helper\Data;
 use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Helper\Output as OutputHelper;
-use Magento\Framework\App\Response\Http as ResponseHttp;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 
 /**
  * Product list
@@ -80,6 +80,11 @@ class ListProduct extends AbstractProduct implements IdentityInterface
      */
     private ?array $specialPriceMap = null;
 
+    /**
+     * @var CollectionFactory
+     */
+    private CollectionFactory $productCollectionFactory;
+
     /**
      * @param Context $context
      * @param PostHelper $postDataHelper
@@ -89,6 +94,7 @@ class ListProduct extends AbstractProduct implements IdentityInterface
      * @param array $data
      * @param OutputHelper|null $outputHelper
      * @param SpecialPriceBulkResolverInterface|null $specialPriceBulkResolver
+     * @param CollectionFactory|null $collectionFactory
      */
     public function __construct(
         Context $context,
@@ -98,7 +104,8 @@ public function __construct(
         Data $urlHelper,
         array $data = [],
         ?OutputHelper $outputHelper = null,
-        ?SpecialPriceBulkResolverInterface $specialPriceBulkResolver = null
+        ?SpecialPriceBulkResolverInterface $specialPriceBulkResolver = null,
+        ?CollectionFactory $collectionFactory = null
     ) {
         $this->_catalogLayer = $layerResolver->get();
         $this->_postDataHelper = $postDataHelper;
@@ -107,6 +114,8 @@ public function __construct(
         $this->specialPriceBulkResolver = $specialPriceBulkResolver ??
             ObjectManager::getInstance()->get(SpecialPriceBulkResolverInterface::class);
         $data['outputHelper'] = $outputHelper ?? ObjectManager::getInstance()->get(OutputHelper::class);
+        $this->productCollectionFactory = $collectionFactory ??
+            ObjectManager::getInstance()->get(CollectionFactory::class);
         parent::__construct(
             $context,
             $data
@@ -218,7 +227,9 @@ protected function _beforeToHtml()
                 }
             } catch (\Throwable) {
                 $this->setData('has_error', true);
-                $this->_productCollection = [];
+                $collection = $this->productCollectionFactory->create();
+                $collection->addFieldToFilter('entity_id', ['in' => []]);
+                $this->_productCollection = $collection;
             }
         }
 

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php

@@ -167,7 +167,6 @@ public function getResult(
                 ]
             );
         }
-
     }
 
     /**

app/code/Magento/CatalogSearch/i18n/en_US.csv

@@ -42,4 +42,3 @@ name,name
 "This value must be compatible with the corresponding setting in the configured search engine.","This value must be compatible with the corresponding setting in the configured search engine."
 "If not specified, Default Search Engine will be used.","If not specified, Default Search Engine will be used."
 "This search engine option is no longer supported by Adobe. It is recommended to use OpenSearch as a search engine instead.","This search engine option is no longer supported by Adobe. It is recommended to use OpenSearch as a search engine instead."
-"Could not perform search","Could not perform search"

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

@@ -16,6 +16,7 @@
 use Magento\Framework\Search\RequestInterface;
 use Magento\Framework\Search\Response\QueryResponse;
 use Magento\Search\Model\Search\PageSizeProvider;
+use OpenSearch\Common\Exceptions\Missing404Exception;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -45,6 +46,23 @@ class Adapter implements AdapterInterface
      */
     private AggregationBuilder $aggregationBuilder;
 
+    /**
+     * Empty response from OpenSearch
+     *
+     * @var array
+     */
+    private static $emptyRawResponse = [
+        'hits' => [
+            'hits' => []
+        ],
+        'aggregations' => [
+            'price_bucket' => [],
+            'category_bucket' => [
+                'buckets' => []
+            ]
+        ]
+    ];
+
     /**
      * @var QueryContainerFactory
      */
@@ -126,6 +144,9 @@ public function query(RequestInterface $request) : QueryResponse
             }
 
             $rawResponse = $client->query($query);
+        } catch (Missing404Exception $e) {
+            $this->logger->critical($e);
+            $rawResponse = self::$emptyRawResponse;
         } catch (\Exception $e) {
             $this->logger->critical($e);
             throw new ClientException($e->getMessage(), $e->getCode(), $e);

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);