From c3d7713aa9958887ec5540167e672c866b5550a1 Mon Sep 17 00:00:00 2001 From: Mark Vulfson Date: Wed, 5 Aug 2020 09:59:10 -0700 Subject: [PATCH] fix(execution promoter): Only enable execution promoter if enabled This way, if an orca cluster is not running the queue we don't enable the promoter --- .../kotlin/com/netflix/spinnaker/orca/qos/ExecutionPromoter.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/orca-qos/src/main/kotlin/com/netflix/spinnaker/orca/qos/ExecutionPromoter.kt b/orca-qos/src/main/kotlin/com/netflix/spinnaker/orca/qos/ExecutionPromoter.kt index 18cdd496e1..63704536c4 100644 --- a/orca-qos/src/main/kotlin/com/netflix/spinnaker/orca/qos/ExecutionPromoter.kt +++ b/orca-qos/src/main/kotlin/com/netflix/spinnaker/orca/qos/ExecutionPromoter.kt @@ -27,6 +27,7 @@ import net.logstash.logback.argument.StructuredArguments.value import org.slf4j.LoggerFactory import org.slf4j.MDC import org.springframework.beans.factory.BeanInitializationException +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty import org.springframework.context.ApplicationListener import org.springframework.scheduling.annotation.Scheduled import org.springframework.stereotype.Component @@ -37,6 +38,7 @@ import org.springframework.stereotype.Component interface ExecutionPromoter @Component +@ConditionalOnProperty("pollers.qos.enabled") class DefaultExecutionPromoter( private val executionLauncher: ExecutionLauncher, private val executionRepository: ExecutionRepository,