Merge pull request #11 from Flowpack/move-config-epoch-set-to-switch-step

BUGFIX: move set of config epoch to switch step

Author: batabana

Classes/Controller/BackendController.php

@@ -98,7 +98,7 @@ public function indexAction(?string $contentStore = null)
         $currentConfigEpoch = $this->configEpochSettings['current'] ?? null;
         $previousConfigEpoch = $this->configEpochSettings['previous'] ?? null;
         $configEpochRedis = $redis->get('contentStore:configEpoch');
-        $showToggleConfigEpochButton = $previousConfigEpoch !== null && !$contentStore->isPrimary();
+        $showToggleConfigEpochButton = $previousConfigEpoch !== null;
 
         $this->view->assign('contentStore', $contentStore->getIdentifier());
         $this->view->assign('overviewData', $this->backendUiDataService->loadBackendOverviewData($contentStore));

Classes/ReleaseSwitch/Infrastructure/RedisReleaseSwitchService.php

@@ -41,6 +41,12 @@ class RedisReleaseSwitchService
      */
     protected $redisKeyPostfixesForEachReleaseConfiguration;
 
+    /**
+     * @Flow\InjectConfiguration("configEpoch")
+     * @var array
+     */
+    protected $configEpochSettings;
+
     public function switchContentRelease(RedisInstanceIdentifier $redisInstanceIdentifier, ContentReleaseIdentifier $contentReleaseIdentifier, ContentReleaseLogger $contentReleaseLogger)
     {
         $redis = $this->redisClient->getRedis($redisInstanceIdentifier);
@@ -71,6 +77,7 @@ public function switchContentRelease(RedisInstanceIdentifier $redisInstanceIdent
         }
 
         $redis->set('contentStore:current', $contentReleaseIdentifier->getIdentifier());
+        $redis->set('contentStore:configEpoch', $this->configEpochSettings['current']);
         $releaseMetadata = $this->redisContentReleaseService->fetchMetadataForContentRelease($contentReleaseIdentifier);
         $this->redisContentReleaseService->setContentReleaseMetadata($contentReleaseIdentifier, $releaseMetadata->withSwitchTime(new \DateTimeImmutable()), $redisInstanceIdentifier);
 

Classes/Transfer/ContentReleaseSynchronizer.php

@@ -28,12 +28,6 @@ class ContentReleaseSynchronizer
      */
     protected $redisKeyPostfixesForEachReleaseConfiguration;
 
-    /**
-     * @Flow\InjectConfiguration("configEpoch")
-     * @var array
-     */
-    protected $configEpochSettings;
-
     /**
      * @Flow\Inject
      * @var RedisKeyService
@@ -70,7 +64,6 @@ public function syncToTarget(RedisInstanceIdentifier $targetRedisIdentifier, Con
         }
 
         $targetRedis->zAdd('contentStore:registeredReleases', 0, $contentReleaseIdentifier->getIdentifier());
-        $targetRedis->set('contentStore:configEpoch', $this->configEpochSettings['current']);
     }
 
     /**