fix(mdc): fix propagation of exection id (#2475)

- also fixes DefaultNodeIdentity tests when running on a host that disallows connections between en* and lo0
spinnaker · Mar 31, 2018 · 2024913 · 2024913
1 parent a1f22b3
commit 2024913
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -39,7 +39,7 @@ allprojects {
   apply plugin: 'groovy'
 
   ext {
-    spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.145.0'
+    spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.149.0'
   }
 
   def checkLocalVersions = [spinnakerDependenciesVersion: spinnakerDependenciesVersion]

diff --git a/...ynomite/src/test/groovy/com/netflix/spinnaker/cat/dynomite/cache/DynomiteCacheSpec.groovy b/...ynomite/src/test/groovy/com/netflix/spinnaker/cat/dynomite/cache/DynomiteCacheSpec.groovy
@@ -179,7 +179,7 @@ class DynomiteCacheSpec extends WriteableCacheSpec {
 
     def localHostSupplier = new HostSupplier() {
       @Override
-      Collection<Host> getHosts() {
+      List<Host> getHosts() {
         return [localHost]
       }
     }
@@ -227,7 +227,7 @@ class DynomiteCacheSpec extends WriteableCacheSpec {
 
     def localHostSupplier = new HostSupplier() {
       @Override
-      Collection<Host> getHosts() {
+      List<Host> getHosts() {
         return [localHost]
       }
     }

diff --git a/...ats-redis/src/main/java/com/netflix/spinnaker/cats/redis/cluster/DefaultNodeIdentity.java b/...ats-redis/src/main/java/com/netflix/spinnaker/cats/redis/cluster/DefaultNodeIdentity.java
@@ -45,13 +45,15 @@ private static String getHostName(String validationHost, int validationPort) {
         } catch (SocketException ignored) {
             return UNKNOWN_HOST;
         }
-        if (interfaces == null) {
+        if (interfaces == null || validationHost == null) {
             return UNKNOWN_HOST;
         }
 
         for (NetworkInterface networkInterface : Collections.list(interfaces)) {
             try {
-                if (networkInterface.isLoopback()) {
+                if (networkInterface.isLoopback() &&
+                  !validationHost.equals("localhost") &&
+                  !validationHost.startsWith("127.")) {
                     continue;
                 }
 

diff --git a/...r-core/src/main/groovy/com/netflix/spinnaker/clouddriver/cache/DynomiteCacheConfig.groovy b/...r-core/src/main/groovy/com/netflix/spinnaker/clouddriver/cache/DynomiteCacheConfig.groovy
@@ -175,7 +175,7 @@ class DynomiteCacheConfig {
     }
 
     @Override
-    Collection<Host> getHosts() {
+    List<Host> getHosts() {
       return hosts
     }
   }

diff --git a/...ddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/core/DynomiteConfig.groovy b/...ddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/core/DynomiteConfig.groovy
@@ -113,7 +113,7 @@ class DynomiteConfig {
     }
 
     @Override
-    Collection<Host> getHosts() {
+    List<Host> getHosts() {
       return hosts
     }
   }

diff --git a/...oovy/com/netflix/spinnaker/clouddriver/orchestration/DefaultOrchestrationProcessor.groovy b/...oovy/com/netflix/spinnaker/clouddriver/orchestration/DefaultOrchestrationProcessor.groovy
@@ -165,6 +165,7 @@ class DefaultOrchestrationProcessor implements OrchestrationProcessor {
     try {
       MDC.remove(AuthenticatedRequest.SPINNAKER_USER)
       MDC.remove(AuthenticatedRequest.SPINNAKER_ACCOUNTS)
+      MDC.remove(AuthenticatedRequest.SPINNAKER_EXECUTION_ID)
     } catch (Exception e) {
       log.error("Unable to clear thread locals, reason: ${e.message}")
     }