fix(discovery): Undo respecting discovery for config poller (#1051)

Follow up to #1050 Apparently, being `UP` is predicated on the config poller having successfully run. But now that I made configpoller predicated on being `UP` echo doesn't come up... There is no harm (just wasted RPS) for disabled instances getting config, so I am undoing this part of the change. I didn't catch this because I tested with discovery being OFF and then turning it OFF and not the other way around.
spinnaker · Nov 2, 2020 · e614e5c · e614e5c
1 parent 7042076
commit e614e5c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/...linetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/PipelineCache.java b/...linetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/PipelineCache.java
@@ -25,7 +25,6 @@
 import com.netflix.spinnaker.echo.model.Trigger;
 import com.netflix.spinnaker.echo.pipelinetriggers.orca.OrcaService;
 import com.netflix.spinnaker.echo.services.Front50Service;
-import com.netflix.spinnaker.kork.discovery.DiscoveryStatusListener;
 import com.netflix.spinnaker.security.AuthenticatedRequest;
 import java.time.Duration;
 import java.time.Instant;
@@ -61,8 +60,6 @@ public class PipelineCache implements MonitoredPoller {
   private volatile Boolean running;
   private volatile Instant lastPollTimestamp;
 
-  private final DiscoveryStatusListener discoveryStatusListener;
-
   @Nullable private volatile List<Pipeline> pipelines;
 
   @Nullable private volatile Map<String, List<Trigger>> triggersByType;
@@ -72,7 +69,6 @@ public PipelineCache(
       @Value("${front50.polling-interval-ms:30000}") int pollingIntervalMs,
       @Value("${front50.polling-sleep-ms:100}") int pollingSleepMs,
       ObjectMapper objectMapper,
-      @NonNull DiscoveryStatusListener discoveryStatusListener,
       @NonNull Front50Service front50,
       @NonNull OrcaService orca,
       @NonNull Registry registry) {
@@ -81,7 +77,6 @@ public PipelineCache(
         pollingIntervalMs,
         pollingSleepMs,
         objectMapper,
-        discoveryStatusListener,
         front50,
         orca,
         registry);
@@ -93,15 +88,13 @@ public PipelineCache(
       int pollingIntervalMs,
       int pollingSleepMs,
       ObjectMapper objectMapper,
-      @NonNull DiscoveryStatusListener discoveryStatusListener,
       @NonNull Front50Service front50,
       @NonNull OrcaService orca,
       @NonNull Registry registry) {
     this.objectMapper = objectMapper;
     this.executorService = executorService;
     this.pollingIntervalMs = pollingIntervalMs;
     this.pollingSleepMs = pollingSleepMs;
-    this.discoveryStatusListener = discoveryStatusListener;
     this.front50 = front50;
     this.orca = orca;
     this.registry = registry;
@@ -137,14 +130,14 @@ public void run() {
   }
 
   private Double getDurationSeconds() {
-    return (lastPollTimestamp == null || !discoveryStatusListener.isEnabled())
+    return (lastPollTimestamp == null)
         ? -1d
         : (double) Duration.between(lastPollTimestamp, now()).getSeconds();
   }
 
   // VisibleForTesting
   void pollPipelineConfigs() {
-    if (!isRunning() || !discoveryStatusListener.isEnabled()) {
+    if (!isRunning()) {
       return;
     }
 

diff --git a/...gers/src/test/groovy/com/netflix/spinnaker/echo/pipelinetriggers/PipelineCacheSpec.groovy b/...gers/src/test/groovy/com/netflix/spinnaker/echo/pipelinetriggers/PipelineCacheSpec.groovy
@@ -26,7 +26,6 @@ import com.netflix.spinnaker.echo.model.Trigger
 import com.netflix.spinnaker.echo.pipelinetriggers.orca.OrcaService
 import com.netflix.spinnaker.echo.services.Front50Service
 import com.netflix.spinnaker.echo.test.RetrofitStubs
-import com.netflix.spinnaker.kork.discovery.DiscoveryStatusListener
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.lang.Subject
@@ -38,7 +37,6 @@ class PipelineCacheSpec extends Specification implements RetrofitStubs {
   def orca = Mock(OrcaService)
   def registry = new NoopRegistry()
   def objectMapper = EchoObjectMapper.getInstance()
-  def activator = Mock(DiscoveryStatusListener)
 
   @Shared
   def interval = 30
@@ -47,7 +45,7 @@ class PipelineCacheSpec extends Specification implements RetrofitStubs {
   def sleepMs = 100
 
   @Subject
-  def pipelineCache = new PipelineCache(Mock(ScheduledExecutorService), interval, sleepMs, objectMapper, activator, front50, orca, registry)
+  def pipelineCache = new PipelineCache(Mock(ScheduledExecutorService), interval, sleepMs, objectMapper, front50, orca, registry)
 
   def "keeps polling if Front50 returns an error"() {
     given:
@@ -58,8 +56,6 @@ class PipelineCacheSpec extends Specification implements RetrofitStubs {
     ]
     def pipeline = Pipeline.builder().application('application').name('Pipeline').id('P1').build()
 
-    activator.isEnabled() >> true
-
     def initialLoad = []
     front50.getPipelines() >> initialLoad >> { throw unavailable() } >> [pipelineMap]
     pipelineCache.start()