ENGCOM-2135: Use the timeout when querying Elasticsearch #15592

magento-engcom-team · magento-engcom-team · commit 34dd5405767a · 2018-06-26T01:25:18.000-05:00
- Merge Pull Request #15592 from mpchadwick/magento2:feature/es-timeout - Merged commits: 1. a65e241
diff --git a/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php
@@ -293,7 +293,8 @@ public function deleteMapping($index, $entityType)
      */
     public function query($query)
     {
-        return $this->client->search($query);
+        $params = array_merge($query, ['client' => ['timeout' => $this->clientOptions['timeout']]]);
+        return $this->client->search($params);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,8 @@ public function deleteMapping($index, $entityType)`
`293`	`293`	`*/`
`294`	`294`	`public function query($query)`
`295`	`295`	`{`
`296`		`- return $this->client->search($query);`
	`296`	`+ $params = array_merge($query, ['client' => ['timeout' => $this->clientOptions['timeout']]]);`
	`297`	`+ return $this->client->search($params);`
`297`	`298`	`}`
`298`	`299`
`299`	`300`	`/**`