Merge pull request #167 from magento-performance/MCP-826

[Performance] Use RabbitMQ for all consumers if AMQP is set in deployment config
magento · Feb 2, 2022 · 536c220 · 536c220
2 parents 71f434b + 067a0e8
commit 536c220
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 61 deletions.
diff --git a/InventoryCatalog/etc/queue.xml b/InventoryCatalog/etc/queue.xml
@@ -6,10 +6,10 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
- <broker topic="inventory.source.items.cleanup" exchange="magento-db" type="db">
- <queue name="inventory.source.items.cleanup" consumer="inventory.source.items.cleanup" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\InventoryCatalog\Model\DeleteSourceItemsBySkus::execute"/>
+ <broker topic="inventory.source.items.cleanup" exchange="magento">
+ <queue name="inventory.source.items.cleanup" consumer="inventory.source.items.cleanup" handler="Magento\InventoryCatalog\Model\DeleteSourceItemsBySkus::execute"/>
  </broker>
- <broker topic="inventory.mass.update" exchange="magento-db" type="db">
- <queue name="inventory.mass.update" consumer="inventory.mass.update" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\InventoryCatalog\Model\UpdateInventory::execute"/>
+ <broker topic="inventory.mass.update" exchange="magento">
+ <queue name="inventory.mass.update" consumer="inventory.mass.update" handler="Magento\InventoryCatalog\Model\UpdateInventory::execute"/>
  </broker>
 </config>
diff --git a/InventoryCatalog/etc/queue_consumer.xml b/InventoryCatalog/etc/queue_consumer.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
- <consumer name="inventory.source.items.cleanup" queue="inventory.source.items.cleanup" connection="db" handler="Magento\InventoryCatalog\Model\DeleteSourceItemsBySkus::execute"/>
- <consumer name="inventory.mass.update" queue="inventory.mass.update" connection="db" handler="Magento\InventoryCatalog\Model\UpdateInventory::execute"/>
+ <consumer name="inventory.source.items.cleanup" queue="inventory.source.items.cleanup" handler="Magento\InventoryCatalog\Model\DeleteSourceItemsBySkus::execute"/>
+ <consumer name="inventory.mass.update" queue="inventory.mass.update" handler="Magento\InventoryCatalog\Model\UpdateInventory::execute"/>
 </config>
diff --git a/InventoryCatalog/etc/queue_publisher.xml b/InventoryCatalog/etc/queue_publisher.xml
@@ -6,19 +6,9 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
- <publisher topic="async.V1.inventory.bulk-product-source-assign.POST">
- <connection name="amqp" exchange="magento" disabled="false" />
- </publisher>
- <publisher topic="async.V1.inventory.bulk-product-source-unassign.POST">
- <connection name="amqp" exchange="magento" disabled="false" />
- </publisher>
- <publisher topic="async.V1.inventory.bulk-product-source-transfer.POST">
- <connection name="amqp" exchange="magento" disabled="false" />
- </publisher>
- <publisher topic="inventory.source.items.cleanup">
- <connection name="db" exchange="magento-db" disabled="false" />
- </publisher>
- <publisher topic="inventory.mass.update">
- <connection name="db" exchange="magento-db" disabled="false" />
- </publisher>
+ <publisher topic="async.V1.inventory.bulk-product-source-assign.POST"/>
+ <publisher topic="async.V1.inventory.bulk-product-source-unassign.POST"/>
+ <publisher topic="async.V1.inventory.bulk-product-source-transfer.POST"/>
+ <publisher topic="inventory.source.items.cleanup"/>
+ <publisher topic="inventory.mass.update"/>
 </config>
diff --git a/InventoryCatalog/etc/queue_topology.xml b/InventoryCatalog/etc/queue_topology.xml
@@ -6,8 +6,8 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
- <exchange name="magento-db" type="topic" connection="db">
- <binding id="InventorySourceItemsCleanUpBinding" topic="inventory.source.items.cleanup" destinationType="queue" destination="inventory.source.items.cleanup"/>
- <binding id="InventoryMassUpdateBinding" topic="inventory.mass.update" destinationType="queue" destination="inventory.mass.update"/>
+ <exchange name="magento">
+ <binding id="InventorySourceItemsCleanUpBinding" topic="inventory.source.items.cleanup" destination="inventory.source.items.cleanup"/>
+ <binding id="InventoryMassUpdateBinding" topic="inventory.mass.update" destination="inventory.mass.update"/>
  </exchange>
 </config>
diff --git a/InventoryIndexer/etc/queue.xml b/InventoryIndexer/etc/queue.xml
@@ -6,13 +6,13 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
- <broker topic="inventory.reservations.updateSalabilityStatus" exchange="magento-db" type="db">
- <queue name="inventory.reservations.updateSalabilityStatus" consumer="inventory.reservations.updateSalabilityStatus" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\InventoryIndexer\Model\Queue\UpdateIndexSalabilityStatus::execute"/>
+ <broker topic="inventory.reservations.updateSalabilityStatus" exchange="magento">
+ <queue name="inventory.reservations.updateSalabilityStatus" consumer="inventory.reservations.updateSalabilityStatus" handler="Magento\InventoryIndexer\Model\Queue\UpdateIndexSalabilityStatus::execute"/>
  </broker>
- <broker topic="inventory.indexer.sourceItem" exchange="magento-db" type="db">
- <queue name="inventory.indexer.sourceItem" consumer="inventory.indexer.sourceItem" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\InventoryIndexer\Indexer\SourceItem\Strategy\Sync::executeList"/>
+ <broker topic="inventory.indexer.sourceItem" exchange="magento">
+ <queue name="inventory.indexer.sourceItem" consumer="inventory.indexer.sourceItem" handler="Magento\InventoryIndexer\Indexer\SourceItem\Strategy\Sync::executeList"/>
  </broker>
- <broker topic="inventory.indexer.stock" exchange="magento-db" type="db">
- <queue name="inventory.indexer.stock" consumer="inventory.indexer.stock" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\InventoryIndexer\Indexer\Stock\Strategy\Sync::executeList"/>
+ <broker topic="inventory.indexer.stock" exchange="magento">
+ <queue name="inventory.indexer.stock" consumer="inventory.indexer.stock" handler="Magento\InventoryIndexer\Indexer\Stock\Strategy\Sync::executeList"/>
  </broker>
 </config>
diff --git a/InventoryIndexer/etc/queue_consumer.xml b/InventoryIndexer/etc/queue_consumer.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
- <consumer name="inventory.reservations.updateSalabilityStatus" queue="inventory.reservations.updateSalabilityStatus" connection="db" consumerInstance="Magento\Framework\MessageQueue\Consumer" />
- <consumer name="inventory.indexer.sourceItem" queue="inventory.indexer.sourceItem" connection="db" handler="Magento\InventoryIndexer\Indexer\SourceItem\Strategy\Sync::executeList"/>
- <consumer name="inventory.indexer.stock" queue="inventory.indexer.stock" connection="db" handler="Magento\InventoryIndexer\Indexer\Stock\Strategy\Sync::executeList"/>
+ <consumer name="inventory.reservations.updateSalabilityStatus" queue="inventory.reservations.updateSalabilityStatus" />
+ <consumer name="inventory.indexer.sourceItem" queue="inventory.indexer.sourceItem" handler="Magento\InventoryIndexer\Indexer\SourceItem\Strategy\Sync::executeList"/>
+ <consumer name="inventory.indexer.stock" queue="inventory.indexer.stock" handler="Magento\InventoryIndexer\Indexer\Stock\Strategy\Sync::executeList"/>
 </config>
diff --git a/InventoryIndexer/etc/queue_publisher.xml b/InventoryIndexer/etc/queue_publisher.xml
@@ -6,13 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
- <publisher topic="inventory.indexer.sourceItem">
- <connection name="db" exchange="magento-db" disabled="false" />
- </publisher>
- <publisher topic="inventory.indexer.stock">
- <connection name="db" exchange="magento-db" disabled="false" />
- </publisher>
- <publisher topic="inventory.reservations.updateSalabilityStatus">
- <connection name="db" exchange="magento-db" disabled="false" />
- </publisher>
+ <publisher topic="inventory.indexer.sourceItem"/>
+ <publisher topic="inventory.indexer.stock"/>
+ <publisher topic="inventory.reservations.updateSalabilityStatus"/>
 </config>
diff --git a/InventoryIndexer/etc/queue_topology.xml b/InventoryIndexer/etc/queue_topology.xml
@@ -6,9 +6,9 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
- <exchange name="magento-db" type="topic" connection="db" >
- <binding id="InventorySourceItemIndexer" topic="inventory.indexer.sourceItem" destinationType="queue" destination="inventory.indexer.sourceItem"/>
- <binding id="InventoryStockIndexer" topic="inventory.indexer.stock" destinationType="queue" destination="inventory.indexer.stock"/>
- <binding id="InventoryReservationUpdateSalabilityStatus" topic="inventory.reservations.updateSalabilityStatus" destinationType="queue" destination="inventory.reservations.updateSalabilityStatus"/>
+ <exchange name="magento">
+ <binding id="InventorySourceItemIndexer" topic="inventory.indexer.sourceItem" destination="inventory.indexer.sourceItem"/>
+ <binding id="InventoryStockIndexer" topic="inventory.indexer.stock" destination="inventory.indexer.stock"/>
+ <binding id="InventoryReservationUpdateSalabilityStatus" topic="inventory.reservations.updateSalabilityStatus" destination="inventory.reservations.updateSalabilityStatus"/>
  </exchange>
 </config>
diff --git a/InventorySales/etc/queue.xml b/InventorySales/etc/queue.xml
@@ -6,10 +6,10 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
- <broker topic="inventory.reservations.cleanup" exchange="magento-db" type="db">
- <queue name="inventory.reservations.cleanup" consumer="inventory.reservations.cleanup" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\InventorySales\Model\ResourceModel\DeleteReservationsBySkus::execute"/>
+ <broker topic="inventory.reservations.cleanup" exchange="magento">
+ <queue name="inventory.reservations.cleanup" consumer="inventory.reservations.cleanup" handler="Magento\InventorySales\Model\ResourceModel\DeleteReservationsBySkus::execute"/>
  </broker>
- <broker topic="inventory.reservations.update" exchange="magento-db" type="db">
- <queue name="inventory.reservations.update" consumer="inventory.reservations.update" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\InventorySales\Model\ResourceModel\UpdateReservationsBySkus::execute"/>
+ <broker topic="inventory.reservations.update" exchange="magento">
+ <queue name="inventory.reservations.update" consumer="inventory.reservations.update" handler="Magento\InventorySales\Model\ResourceModel\UpdateReservationsBySkus::execute"/>
  </broker>
 </config>
diff --git a/InventorySales/etc/queue_consumer.xml b/InventorySales/etc/queue_consumer.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
- <consumer name="inventory.reservations.update" queue="inventory.reservations.update" connection="db" handler="Magento\InventorySales\Model\ResourceModel\UpdateReservationsBySkus::execute"/>
- <consumer name="inventory.reservations.cleanup" queue="inventory.reservations.cleanup" connection="db" handler="Magento\InventorySales\Model\ResourceModel\DeleteReservationsBySkus::execute"/>
+ <consumer name="inventory.reservations.update" queue="inventory.reservations.update" handler="Magento\InventorySales\Model\ResourceModel\UpdateReservationsBySkus::execute"/>
+ <consumer name="inventory.reservations.cleanup" queue="inventory.reservations.cleanup" handler="Magento\InventorySales\Model\ResourceModel\DeleteReservationsBySkus::execute"/>
 </config>
diff --git a/InventorySales/etc/queue_publisher.xml b/InventorySales/etc/queue_publisher.xml
@@ -6,10 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
- <publisher topic="inventory.reservations.update">
- <connection name="db" exchange="magento-db" disabled="false" />
- </publisher>
- <publisher topic="inventory.reservations.cleanup">
- <connection name="db" exchange="magento-db" disabled="false" />
- </publisher>
+ <publisher topic="inventory.reservations.update"/>
+ <publisher topic="inventory.reservations.cleanup"/>
 </config>
diff --git a/InventorySales/etc/queue_topology.xml b/InventorySales/etc/queue_topology.xml
@@ -6,8 +6,8 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
- <exchange name="magento-db" type="topic" connection="db">
- <binding id="InventoryReservationsUpdateBindingDb" topic="inventory.reservations.update" destinationType="queue" destination="inventory.reservations.update"/>
- <binding id="InventoryReservationsDeleteBindingDb" topic="inventory.reservations.cleanup" destinationType="queue" destination="inventory.reservations.cleanup"/>
+ <exchange name="magento">
+ <binding id="InventoryReservationsUpdateBindingDb" topic="inventory.reservations.update" destination="inventory.reservations.update"/>
+ <binding id="InventoryReservationsDeleteBindingDb" topic="inventory.reservations.cleanup" destination="inventory.reservations.cleanup"/>
  </exchange>
 </config>