MC-19646: [Magento Cloud] - Catalog Product Rule Indexer stuck

Author: dhorytskyi

app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php

@@ -292,23 +292,8 @@ protected function doReindexByIds($ids)
 
         /** @var Rule[] $activeRules */
         $activeRules = $this->getActiveRules()->getItems();
-        foreach ($activeRules as $activeRule) {
-            $rule = clone $activeRule;
-            $rule->setProductsFilter($ids);
-            $matchedProductIds = $rule->getMatchingProductIds();
-            if (empty($matchedProductIds)) {
-                continue;
-            }
-
-            $matchedProductIds = array_intersect_key($matchedProductIds, array_flip($ids));
-            foreach ($matchedProductIds as $matchedProductId => $validationByWebsite) {
-                $websiteIds = array_keys(array_filter($validationByWebsite));
-                if (empty($websiteIds)) {
-                    continue;
-                }
-
-                $this->assignProductToRule($rule, $matchedProductId, $websiteIds);
-            }
+        foreach ($activeRules as $rule) {
+            $this->reindexRuleProduct->execute($rule, $this->batchCount);
         }
 
         foreach ($ids as $productId) {

app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/ConfigurableProductHandler.php

@@ -1,16 +1,14 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\CatalogRuleConfigurable\Plugin\CatalogRule\Model\Rule;
 
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\CatalogRuleConfigurable\Plugin\CatalogRule\Model\ConfigurableProductsProvider;
 
 /**
- * Add configurable sub products to catalog rule indexer on full reindex
+ * Add configurable sub products to catalog rule indexer on reindex
  */
 class ConfigurableProductHandler
 {
@@ -42,9 +40,12 @@ public function __construct(
     }
 
     /**
+     * Add configurable products during setting product ids for filtering
+     *
      * @param \Magento\CatalogRule\Model\Rule $rule
      * @param int|array $productIds
      * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforeSetProductsFilter(\Magento\CatalogRule\Model\Rule $rule, $productIds)
     {
@@ -62,6 +63,8 @@ public function beforeSetProductsFilter(\Magento\CatalogRule\Model\Rule $rule, $
     }
 
     /**
+     * Add configurable products for matched products
+     *
      * @param \Magento\CatalogRule\Model\Rule $rule
      * @param array $productIds
      * @return array