MC-25269: Upgrade from 2.3.x CE with SD to 2.3.x EE fails

- move trigger updates from recurring data to recurring schema

Author: krissyhiserote

app/code/Magento/Indexer/Setup/Recurring.php

@@ -6,13 +6,15 @@
 
 namespace Magento\Indexer\Setup;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Encryption\Encryptor;
 use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Framework\Indexer\StateInterface;
 use Magento\Framework\Json\EncoderInterface;
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Indexer\IndexerInterfaceFactory;
 use Magento\Framework\Indexer\ConfigInterface;
 use Magento\Indexer\Model\Indexer\State;
 use Magento\Indexer\Model\Indexer\StateFactory;
@@ -51,6 +53,11 @@ class Recurring implements InstallSchemaInterface
      */
     private $stateFactory;
 
+    /**
+     * @var IndexerInterfaceFactory
+     */
+    private $indexerFactory;
+
     /**
      * Init
      *
@@ -59,19 +66,22 @@ class Recurring implements InstallSchemaInterface
      * @param ConfigInterface $config
      * @param EncryptorInterface $encryptor
      * @param EncoderInterface $encoder
+     * @param IndexerInterfaceFactory|null $indexerFactory
      */
     public function __construct(
         CollectionFactory $statesFactory,
         StateFactory $stateFactory,
         ConfigInterface $config,
         EncryptorInterface $encryptor,
-        EncoderInterface $encoder
+        EncoderInterface $encoder,
+        IndexerInterfaceFactory $indexerFactory = null
     ) {
         $this->statesFactory = $statesFactory;
         $this->stateFactory = $stateFactory;
         $this->config = $config;
         $this->encryptor = $encryptor;
         $this->encoder = $encoder;
+        $this->indexerFactory = $indexerFactory ?: ObjectManager::getInstance()->get(IndexerInterfaceFactory::class);
     }
 
     /**
@@ -107,6 +117,11 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 $state->setStatus(StateInterface::STATUS_INVALID);
                 $state->save();
             }
+
+            $indexer = $this->indexerFactory->create()->load($indexerId);
+            if ($indexer->isScheduled()) {
+                $indexer->getView()->unsubscribe()->subscribe();
+            }
         }
     }
 }