feat(redis_migration): log if there are still pending orchestrations/…

…pipelines (#1626)
spinnaker · Sep 19, 2017 · f05e602 · f05e602
1 parent c57a06a
commit f05e602
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/...pinnaker/orca/front50/migrations/MultiRedisOrchestrationMigrationNotificationAgent.groovy b/...pinnaker/orca/front50/migrations/MultiRedisOrchestrationMigrationNotificationAgent.groovy
@@ -110,14 +110,20 @@ class MultiRedisOrchestrationMigrationNotificationAgent extends AbstractPollingN
 
     allApplications.eachWithIndex { Application application, int index ->
       def applicationName = application.name.toLowerCase()
-      def migratableOrchestrations = executionRepositoryPrevious
+      def unmigratedOrchestrations = executionRepositoryPrevious
         .retrieveOrchestrationsForApplication(applicationName, executionCriteria)
-        .filter({ orchestration -> orchestration.status.isComplete() && !previouslyMigratedOrchestrationIds.contains(orchestration.id) })
+        .filter({ orchestration -> !previouslyMigratedOrchestrationIds.contains(orchestration.id) })
         .toList()
         .toBlocking()
         .single()
 
+      def migratableOrchestrations = unmigratedOrchestrations.findAll { it.status.isComplete() }
+      def pendingOrchestrations = unmigratedOrchestrations.findAll { !it.status.isComplete() }
+
       if (migratableOrchestrations.isEmpty()) {
+        if (!pendingOrchestrations.isEmpty()) {
+          log.info("${pendingOrchestrations.size()} orchestrations yet to complete ${applicationName}) [${index}/${allApplications.size()}]")
+        }
         return
       }
 

diff --git a/...lix/spinnaker/orca/front50/migrations/MultiRedisPipelineMigrationNotificationAgent.groovy b/...lix/spinnaker/orca/front50/migrations/MultiRedisPipelineMigrationNotificationAgent.groovy
@@ -107,14 +107,20 @@ class MultiRedisPipelineMigrationNotificationAgent extends AbstractPollingNotifi
     log.info("Found ${allPipelineConfigIds.size()} pipeline configs")
 
     allPipelineConfigIds.eachWithIndex { String pipelineConfigId, int index ->
-      def migratablePipelines = executionRepositoryPrevious
+      def unmigratedPipelines = executionRepositoryPrevious
         .retrievePipelinesForPipelineConfigId(pipelineConfigId, executionCriteria)
-        .filter({ pipeline -> pipeline.status.isComplete() && !previouslyMigratedPipelineIds.contains(pipeline.id) })
+        .filter({ pipeline -> !previouslyMigratedPipelineIds.contains(pipeline.id) })
         .toList()
         .toBlocking()
         .single()
 
+      def migratablePipelines = unmigratedPipelines.findAll { it.status.isComplete() }
+      def pendingPipelines = unmigratedPipelines.findAll { !it.status.isComplete() }
+
       if (migratablePipelines.isEmpty()) {
+        if (!pendingPipelines.isEmpty()) {
+          log.info("${pendingPipelines.size()} pipelines yet to complete (${pipelineConfigId}) [${index}/${allPipelineConfigIds.size()}]")
+        }
         return
       }