Merge pull request #1390 from tomaslin/titus-use-instance-ids-for-health

Titus: link titus task to discovery instance with the instanceId
spinnaker · Jan 24, 2017 · edc1e22 · edc1e22
2 parents dfd14d6 + 0916894
commit edc1e22
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...c/main/groovy/com/netflix/spinnaker/clouddriver/titus/caching/TitusCachingProvider.groovy b/...c/main/groovy/com/netflix/spinnaker/clouddriver/titus/caching/TitusCachingProvider.groovy
@@ -42,7 +42,7 @@ class TitusCachingProvider implements Provider, EurekaAwareProvider {
 
   @Override
   Boolean isProviderForEurekaRecord(Map<String, Object> attributes) {
-    attributes.containsKey('titusTaskId') && attributes.get('titusTaskId') != null
+    attributes.containsKey('titusTaskId') && attributes.get('titusTaskId') != null && attributes.get('instanceId') != null
   }
 
   @Override
@@ -52,7 +52,7 @@ class TitusCachingProvider implements Provider, EurekaAwareProvider {
 
   @Override
   String getInstanceHealthKey(Map<String, Object> attributes,  String region, String healthId) {
-    Keys.getInstanceHealthKey(attributes.titusTaskId, healthId)
+    Keys.getInstanceHealthKey(attributes.instanceId, healthId)
   }
 
 }
diff --git a/...ovy/com/netflix/spinnaker/clouddriver/titus/caching/providers/TitusClusterProvider.groovy b/...ovy/com/netflix/spinnaker/clouddriver/titus/caching/providers/TitusClusterProvider.groovy
@@ -241,7 +241,7 @@ class TitusClusterProvider implements ClusterProvider<TitusCluster> {
     instanceData.each { instanceEntry ->
       externalHealthProviders.each { externalHealthProvider ->
         externalHealthProvider.agents.each { externalHealthAgent ->
-          def key = Keys.getInstanceHealthKey(instanceEntry.attributes.task.id, externalHealthAgent.healthId)
+          def key = Keys.getInstanceHealthKey(instanceEntry.attributes.task.instanceId, externalHealthAgent.healthId)
           healthKeysToInstance.put(key, instanceEntry.id)
         }
       }

diff --git a/...vy/com/netflix/spinnaker/clouddriver/titus/caching/providers/TitusInstanceProvider.groovy b/...vy/com/netflix/spinnaker/clouddriver/titus/caching/providers/TitusInstanceProvider.groovy
@@ -70,7 +70,7 @@ class TitusInstanceProvider implements InstanceProvider<TitusInstance> {
     externalHealthProviders.each { externalHealthProvider ->
       def healthKeys = []
       externalHealthProvider.agents.each { externalHealthAgent ->
-        healthKeys << Keys.getInstanceHealthKey(instance.name, externalHealthAgent.healthId)
+        healthKeys << Keys.getInstanceHealthKey(instance.instanceId, externalHealthAgent.healthId)
       }
       healthKeys.unique().each { key ->
         def externalHealth = cacheView.getAll(HEALTH.ns, key)