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

Author: aplapana

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

@@ -17,6 +17,7 @@
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\ArgumentsProcessorInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Search\Request\EmptyRequestDataException;
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Search\Api\SearchInterface;
 
@@ -154,7 +155,9 @@ public function getResult(
                     'suggestions' => $suggestions,
                 ]
             );
-        } catch (ClientException) {
+        } catch (GraphQlInputException $e) {
+            throw $e;
+        } catch (\InvalidArgumentException|EmptyRequestDataException|ClientException) {
             return $this->searchResultFactory->create(
                 [
                     'totalCount' => 0,

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

@@ -24,6 +24,7 @@
 
 /**
  * OpenSearch Search Adapter
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Adapter implements AdapterInterface
 {