feat(sql): Set initial delay for migrateEntityTags()

Entity Tags migration relies on the `EntityTagsDAO` being populated. This can take a reasonable amount of time given a large number of entity tags.
spinnaker · Jul 8, 2019 · d880dbb · d880dbb
1 parent 817d344
commit d880dbb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...-sql/src/main/kotlin/com/netflix/spinnaker/config/CompositeStorageServiceConfiguration.kt b/...-sql/src/main/kotlin/com/netflix/spinnaker/config/CompositeStorageServiceConfiguration.kt
@@ -47,6 +47,7 @@ class CompositeStorageServiceConfiguration() {
     )
 
   @Bean
+  @ConditionalOnProperty("spinnaker.migration.compositeStorageService.enabled")
   fun storageServiceMigrator(dynamicConfigService: DynamicConfigService,
                              registry: Registry,
                              properties: StorageServiceMigratorConfigurationProperties,

diff --git a/...50-sql/src/main/kotlin/com/netflix/spinnaker/front50/migrations/StorageServiceMigrator.kt b/...50-sql/src/main/kotlin/com/netflix/spinnaker/front50/migrations/StorageServiceMigrator.kt
@@ -195,7 +195,7 @@ class StorageServiceMigrator(
     log.info("Migration complete in {}ms", migrationDurationMs)
   }
 
-  @Scheduled(fixedDelay = 90000)
+  @Scheduled(initialDelay = 1800000, fixedDelay = 90000)
   fun migrateEntityTags() {
     if (!dynamicConfigService.isEnabled("spinnaker.migration.entityTags", false)) {
       log.info("Entity Tags Migrator has been disabled")