From 8482b700415f0a84f192e6d20727be550d1485b4 Mon Sep 17 00:00:00 2001
From: olsi-qose <olsi.qose@nosto.com>
Date: Wed, 17 Mar 2021 15:49:47 +0200
Subject: [PATCH 1/3] Lower max number of messages per consumer

---
 Model/Service/Sync/AbstractBulkConsumer.php | 2 +-
 etc/queue_consumer.xml                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Model/Service/Sync/AbstractBulkConsumer.php b/Model/Service/Sync/AbstractBulkConsumer.php
index 58f0ed8a9..2966ad288 100644
--- a/Model/Service/Sync/AbstractBulkConsumer.php
+++ b/Model/Service/Sync/AbstractBulkConsumer.php
@@ -99,7 +99,6 @@ public function processOperation($operation)
             $message = __('Success.');
             $operation->setStatus(OperationInterface::STATUS_TYPE_COMPLETE)
                 ->setResultMessage($message);
-            $this->entityManager->save($operation);
         } catch (Exception $e) {
             $this->logger->critical(sprintf('Bulk uuid: %s. %s', $operation->getBulkUuid(), $e->getMessage()));
             /** @phan-suppress-next-line PhanTypeMismatchArgument */
@@ -107,6 +106,7 @@ public function processOperation($operation)
             $operation->setStatus(OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED)
                 ->setErrorCode($e->getCode())
                 ->setResultMessage($message);
+        } finally {
             $this->entityManager->save($operation);
         }
     }
diff --git a/etc/queue_consumer.xml b/etc/queue_consumer.xml
index effe0a961..91a5989bd 100644
--- a/etc/queue_consumer.xml
+++ b/etc/queue_consumer.xml
@@ -38,13 +38,13 @@
     <consumer name="nosto_product_sync.update"
               queue="nosto_product_sync.update"
               connection="db"
-              maxMessages="5000"
+              maxMessages="10"
               consumerInstance="Magento\Framework\MessageQueue\Consumer"
               handler="Nosto\Tagging\Model\Service\Sync\Upsert\AsyncBulkConsumer::processOperation"/>
     <consumer name="nosto_product_sync.delete"
               queue="nosto_product_sync.delete"
               connection="db"
-              maxMessages="5000"
+              maxMessages="100"
               consumerInstance="Magento\Framework\MessageQueue\Consumer"
               handler="Nosto\Tagging\Model\Service\Sync\Delete\AsyncBulkConsumer::processOperation"/>
 </config>

From 20c78d43bf6a7d3e0181e873f7fd77893d3369f9 Mon Sep 17 00:00:00 2001
From: olsi-qose <olsi.qose@nosto.com>
Date: Wed, 17 Mar 2021 16:04:30 +0200
Subject: [PATCH 2/3] Bump version and update changelog

---
 CHANGELOG.md   | 3 +++
 composer.json  | 2 +-
 etc/module.xml | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39eec872e..48d40658c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 All notable changes to this project will be documented in this file. This project adheres to Semantic Versioning.
 
+### 5.2.5
+* Fix product update consumer running out of memory issue 
+
 ### 5.2.4
 * Fix order tagging rendering in case variation tags were missing
 
diff --git a/composer.json b/composer.json
index 27652109b..415f2e97a 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
   "name": "nosto/module-nostotagging",
   "description": "Increase your conversion rate and average order value by delivering your customers personalized product recommendations throughout their shopping journey.",
   "type": "magento2-module",
-  "version": "5.2.4",
+  "version": "5.2.5",
   "require-dev": {
     "phpmd/phpmd": "^2.5",
     "sebastian/phpcpd": "*",
diff --git a/etc/module.xml b/etc/module.xml
index d9422c582..5d2511bf7 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -37,5 +37,5 @@
 <!--suppress XmlUnboundNsPrefix -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Nosto_Tagging" setup_version="5.2.4"/>
+    <module name="Nosto_Tagging" setup_version="5.2.5"/>
 </config>

From 77edd85ba14a55ea742e3a987a7b28b8a97ef3a8 Mon Sep 17 00:00:00 2001
From: olsi-qose <olsi.qose@nosto.com>
Date: Wed, 17 Mar 2021 16:07:00 +0200
Subject: [PATCH 3/3] Set maxMessages to 20

---
 etc/queue_consumer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/queue_consumer.xml b/etc/queue_consumer.xml
index 91a5989bd..d6c596e3c 100644
--- a/etc/queue_consumer.xml
+++ b/etc/queue_consumer.xml
@@ -38,7 +38,7 @@
     <consumer name="nosto_product_sync.update"
               queue="nosto_product_sync.update"
               connection="db"
-              maxMessages="10"
+              maxMessages="20"
               consumerInstance="Magento\Framework\MessageQueue\Consumer"
               handler="Nosto\Tagging\Model\Service\Sync\Upsert\AsyncBulkConsumer::processOperation"/>
     <consumer name="nosto_product_sync.delete"