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

Author: aplapana

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

@@ -28,6 +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;
 
 /**
  * Product list
@@ -88,6 +89,7 @@ class ListProduct extends AbstractProduct implements IdentityInterface
      * @param array $data
      * @param OutputHelper|null $outputHelper
      * @param SpecialPriceBulkResolverInterface|null $specialPriceBulkResolver
+     * @param ResponseHttp|null $response
      */
     public function __construct(
         Context $context,
@@ -208,14 +210,16 @@ protected function _beforeToHtml()
         $this->addToolbarBlock($collection);
 
         if (!$collection->isLoaded()) {
-            $collection->load();
-        }
-
-        $categoryId = $this->getLayer()->getCurrentCategory()->getId();
-
-        if ($categoryId) {
-            foreach ($collection as $product) {
-                $product->setData('category_id', $categoryId);
+            try {
+                $products = $collection->getItems();
+                if ($categoryId = $this->getLayer()->getCurrentCategory()->getId()) {
+                    foreach ($products as $product) {
+                        $product->setData('category_id', $categoryId);
+                    }
+                }
+            } catch (\Throwable) {
+                $this->setData('has_error', true);
+                $this->_productCollection = [];
             }
         }
 

app/code/Magento/Catalog/view/frontend/templates/product/list.phtml

@@ -20,7 +20,7 @@ $_productCollection = $block->getLoadedProductCollection();
 /** @var \Magento\Catalog\Helper\Output $_helper */
 $_helper = $block->getData('outputHelper');
 ?>
-<?php if (!$_productCollection->count()): ?>
+<?php if ($block->getData('has_error') || !$_productCollection->count()): ?>
     <div class="message info empty">
         <div><?= $escaper->escapeHtml(__('We can\'t find products matching the selection.')) ?></div>
     </div>

lib/internal/Magento/Framework/Search/Search.php

@@ -6,11 +6,11 @@
 namespace Magento\Framework\Search;
 
 use Magento\AdvancedSearch\Model\Client\ClientException;
-use Magento\Elasticsearch\SearchAdapter\Aggregation\Builder as AggregationBuilder;
 use Magento\Elasticsearch\SearchAdapter\ResponseFactory;
 use Magento\Framework\Api\Search\SearchInterface;
 use Magento\Framework\Api\Search\SearchCriteriaInterface;
 use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Search\Request\Builder;
 
 /**
@@ -43,37 +43,30 @@ class Search implements SearchInterface
      */
     private ResponseFactory $responseFactory;
 
-    /**
-     * @var AggregationBuilder
-     */
-    private AggregationBuilder $aggregationBuilder;
-
     /**
      * @param Builder $requestBuilder
      * @param ScopeResolverInterface $scopeResolver
      * @param SearchEngineInterface $searchEngine
      * @param SearchResponseBuilder $searchResponseBuilder
      * @param ResponseFactory $responseFactory
-     * @param AggregationBuilder $aggregationBuilder
      */
     public function __construct(
         Builder $requestBuilder,
         ScopeResolverInterface $scopeResolver,
         SearchEngineInterface $searchEngine,
         SearchResponseBuilder $searchResponseBuilder,
-        ResponseFactory $responseFactory,
-        AggregationBuilder $aggregationBuilder
+        ResponseFactory $responseFactory
     ) {
         $this->requestBuilder = $requestBuilder;
         $this->scopeResolver = $scopeResolver;
         $this->searchEngine = $searchEngine;
         $this->searchResponseBuilder = $searchResponseBuilder;
         $this->responseFactory = $responseFactory;
-        $this->aggregationBuilder = $aggregationBuilder;
     }
 
     /**
      * @inheritdoc
+     * @throws LocalizedException
      */
     public function search(SearchCriteriaInterface $searchCriteria)
     {
@@ -106,15 +99,7 @@ public function search(SearchCriteriaInterface $searchCriteria)
             $response = $this->searchResponseBuilder->build($searchResponse)
                 ->setSearchCriteria($searchCriteria);
         } catch (ClientException $e) {
-            $aggregations = $this->aggregationBuilder->build($request, AdapterInterface::EMPTY_RAW_RESPONSE);
-            $response = $this->responseFactory->create(
-                [
-                    'documents' => [],
-                    'aggregations' => $aggregations,
-                    'total' => 0
-                ]
-            );
-            $response = $this->searchResponseBuilder->build($response)->setSearchCriteria($searchCriteria);
+            throw new LocalizedException(__('Could not perform search'), $e, $e->getCode());
         }
 
         return $response;

lib/internal/Magento/Framework/View/Layout.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -11,10 +11,16 @@
 use Magento\Framework\App\State as AppState;
 use Magento\Framework\Cache\FrontendInterface;
 use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\Response\Http as ResponseHttp;
 use Magento\Framework\Message\ManagerInterface as MessageManagerInterface;
 use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\View\Design\Theme\ResolverInterface;
+use Magento\Framework\View\Layout\Data\Structure;
 use Magento\Framework\View\Layout\Element;
+use Magento\Framework\View\Layout\GeneratorPool;
+use Magento\Framework\View\Layout\ProcessorFactory;
+use Magento\Framework\View\Layout\Reader\ContextFactory;
+use Magento\Framework\View\Layout\ReaderPool;
 use Psr\Log\LoggerInterface as Logger;
 
 /**
@@ -183,21 +189,27 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
     private $cacheLifetime;
 
     /**
-     * @param Layout\ProcessorFactory $processorFactory
+     * @var ResponseHttp
+     */
+    private ResponseHttp $response;
+
+    /**
+     * @param ProcessorFactory $processorFactory
      * @param ManagerInterface $eventManager
-     * @param Layout\Data\Structure $structure
+     * @param Structure $structure
      * @param MessageManagerInterface $messageManager
-     * @param Design\Theme\ResolverInterface $themeResolver
-     * @param Layout\ReaderPool $readerPool
-     * @param Layout\GeneratorPool $generatorPool
+     * @param ResolverInterface $themeResolver
+     * @param ReaderPool $readerPool
+     * @param GeneratorPool $generatorPool
      * @param FrontendInterface $cache
-     * @param Layout\Reader\ContextFactory $readerContextFactory
+     * @param ContextFactory $readerContextFactory
      * @param Layout\Generator\ContextFactory $generatorContextFactory
-     * @param \Magento\Framework\App\State $appState
-     * @param \Psr\Log\LoggerInterface $logger
+     * @param State $appState
+     * @param LoggerInterface $logger
      * @param bool $cacheable
      * @param SerializerInterface|null $serializer
      * @param int|null $cacheLifetime
+     * @param ResponseHttp|null $response
      */
     public function __construct(
         Layout\ProcessorFactory $processorFactory,
@@ -214,12 +226,13 @@ public function __construct(
         Logger $logger,
         $cacheable = true,
         ?SerializerInterface $serializer = null,
-        ?int $cacheLifetime = null
+        ?int $cacheLifetime = null,
+        ?ResponseHttp $response = null
     ) {
         $this->_elementClass = \Magento\Framework\View\Layout\Element::class;
         $this->_renderingOutput = new \Magento\Framework\DataObject();
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
-
+        $this->response = $response ?: ObjectManager::getInstance()->get(ResponseHttp::class);
         $this->_processorFactory = $processorFactory;
         $this->_eventManager = $eventManager;
         $this->structure = $structure;
@@ -557,6 +570,7 @@ public function renderNonCachedElement($name)
                 $result = $this->_renderContainer($name, false);
             }
         } catch (\Exception $e) {
+            $this->response->setNoCacheHeaders();
             if ($this->appState->getMode() === AppState::MODE_DEVELOPER) {
                 throw $e;
             }