ENGCOM-8163: honor queue_consumer.xml maxMessages #28995

Author: sidolov

app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php

@@ -131,7 +131,7 @@ public function run()
             ];
 
             if ($maxMessages) {
-                $arguments[] = '--max-messages=' . $maxMessages;
+                $arguments[] = '--max-messages=' . min($consumer->getMaxMessages() ?? $maxMessages, $maxMessages);
             }
 
             $command = $php . ' ' . BP . '/bin/magento queue:consumers:start %s %s'

dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php

@@ -3,31 +3,36 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\MessageQueue\Model\Cron;
 
+use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
-use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Lock\Backend\Database;
-use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfigInterface;
-use Magento\Framework\Lock\LockManagerInterface;
 use Magento\Framework\App\DeploymentConfig\FileReader;
 use Magento\Framework\App\DeploymentConfig\Writer;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Config\File\ConfigFilePool;
-use Magento\Framework\ShellInterface;
 use Magento\Framework\Filesystem;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\Lock\Backend\Database;
+use Magento\Framework\Lock\LockManagerInterface;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfigInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\ShellInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests the different cases of consumers running by ConsumersRunner
  *
- * {@inheritdoc}
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class ConsumersRunnerTest extends \PHPUnit\Framework\TestCase
+class ConsumersRunnerTest extends TestCase
 {
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     private $objectManager;
 
@@ -69,7 +74,7 @@ class ConsumersRunnerTest extends \PHPUnit\Framework\TestCase
     private $appConfig;
 
     /**
-     * @var ShellInterface|\PHPUnit\Framework\MockObject\MockObject
+     * @var ShellInterface|MockObject
      */
     private $shellMock;
 
@@ -83,7 +88,7 @@ class ConsumersRunnerTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp(): void
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->objectManager = Bootstrap::getObjectManager();
         $this->shellMock = $this->getMockBuilder(ShellInterface::class)
             ->getMockForAbstractClass();
         $resourceConnection = $this->objectManager->create(ResourceConnection::class);
@@ -106,7 +111,7 @@ protected function setUp(): void
             ->willReturnCallback(
                 function ($command, $arguments) {
                     $command = vsprintf($command, $arguments);
-                    $params = \Magento\TestFramework\Helper\Bootstrap::getInstance()->getAppInitParams();
+                    $params = Bootstrap::getInstance()->getAppInitParams();
                     $params['MAGE_DIRS']['base']['path'] = BP;
                     $params = 'INTEGRATION_TEST_PARAMS="' . urldecode(http_build_query($params)) . '"';
                     $command = str_replace('bin/magento', 'dev/tests/integration/bin/magento', $command);
@@ -117,6 +122,52 @@ function ($command, $arguments) {
             );
     }
 
+    /**
+     * @param string $specificConsumer
+     * @param int $maxMessage
+     * @param string $command
+     * @param array $expectedArguments
+     *
+     * @return void
+     * @dataProvider runDataProvider
+     */
+    public function testArgumentMaxMessages(
+        string $specificConsumer,
+        int $maxMessage,
+        string $command,
+        array $expectedArguments
+    ) {
+        $config = $this->config;
+        $config['cron_consumers_runner'] = ['consumers' => [$specificConsumer], 'max_messages' => $maxMessage];
+        $this->writeConfig($config);
+        $this->shellMock->expects($this->any())
+            ->method('execute')
+            ->with($command, $expectedArguments);
+
+        $this->consumersRunner->run();
+    }
+
+    /**
+     * @return array
+     */
+    public function runDataProvider()
+    {
+        return [
+          [
+              'specificConsumer' => 'exportProcessor',
+              'max_messages' => 10,
+              'command' => PHP_BINARY . ' ' . BP . '/bin/magento queue:consumers:start %s %s %s',
+              'expectedArguments' => ['exportProcessor', '--single-thread', '--max-messages=10'],
+          ],
+          [
+              'specificConsumer' => 'exportProcessor',
+              'max_messages' => 5000,
+              'command' => PHP_BINARY . ' ' . BP . '/bin/magento queue:consumers:start %s %s %s',
+              'expectedArguments' => ['exportProcessor', '--single-thread', '--max-messages=100'],
+          ],
+        ];
+    }
+
     /**
      * Tests running of specific consumer and his re-running when it is working
      *