fix: service tasks filter

Closes DCOS-41313
dcos · Apr 10, 2019 · afe59df · afe59df
1 parent 533005b
commit afe59df
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 17 deletions.
diff --git a/plugins/services/src/js/structs/Service.js b/plugins/services/src/js/structs/Service.js
@@ -21,8 +21,7 @@ module.exports = class Service extends Item {
     return this.getId()
       .split("/")
       .slice(1)
-      .reverse()
-      .join(".");
+      .join("_");
   }
 
   getName() {

diff --git a/plugins/services/src/js/structs/__tests__/Service-test.js b/plugins/services/src/js/structs/__tests__/Service-test.js
@@ -12,12 +12,12 @@ describe("Service", function() {
   });
 
   describe("#getMesosId", function() {
-    it("returns correct id", function() {
+    it("returns correct id prefix", function() {
       const service = new Service({
         id: "/test/cmd"
       });
 
-      expect(service.getMesosId()).toEqual("cmd.test");
+      expect(service.getMesosId()).toEqual("test_cmd");
     });
   });
 

diff --git a/src/js/stores/MesosStateStore.js b/src/js/stores/MesosStateStore.js
@@ -246,10 +246,10 @@ class MesosStateStore extends GetSetBaseStore {
     const { frameworks, tasks = [] } = this.getLastMesosState();
     const serviceName = service.getName();
 
-    // Convert serviceId to Mesos task name
-    const mesosTaskName = service.getMesosId();
+    // Convert serviceId to Mesos task id prefix
+    const taskIdPrefix = service.getMesosId();
 
-    if (!serviceName || !mesosTaskName || !frameworks) {
+    if (!serviceName || !taskIdPrefix || !frameworks) {
       return [];
     }
 
@@ -273,7 +273,11 @@ class MesosStateStore extends GetSetBaseStore {
     }
 
     return tasks
-      .filter(task => task.isStartedByMarathon && task.name === mesosTaskName)
+      .filter(
+        task =>
+          task.isStartedByMarathon &&
+          task.id.startsWith(`${taskIdPrefix}.instance`)
+      )
       .concat(serviceTasks)
       .map(task => MesosStateUtil.flagSDKTask(task, service));
   }

diff --git a/src/js/stores/__tests__/MesosStateStore-test.js b/src/js/stores/__tests__/MesosStateStore-test.js
@@ -120,25 +120,31 @@ describe("MesosStateStore", function() {
           tasks: [
             {
               name: "spark",
-              id: "spark.1",
+              id: "spark.instance.1",
               framework_id: "marathon_1",
               isStartedByMarathon: true
             },
             {
               name: "alpha",
-              id: "alpha.1",
+              id: "alpha.instance.1",
               framework_id: "marathon_1",
               isStartedByMarathon: true
             },
             {
               name: "alpha",
-              id: "alpha.2",
+              id: "alpha.instance.2",
               framework_id: "marathon_1",
               isStartedByMarathon: true
             },
             {
               name: "alpha",
-              id: "alpha.3",
+              id: "alpha.instance.3",
+              framework_id: "marathon_1",
+              isStartedByMarathon: true
+            },
+            {
+              name: "alpha",
+              id: "pod_alpha.instance.3",
               framework_id: "marathon_1",
               isStartedByMarathon: true
             },
@@ -164,7 +170,7 @@ describe("MesosStateStore", function() {
       expect(tasks).toEqual([
         {
           name: "spark",
-          id: "spark.1",
+          id: "spark.instance.1",
           framework_id: "marathon_1",
           isStartedByMarathon: true
         },
@@ -181,19 +187,19 @@ describe("MesosStateStore", function() {
       expect(tasks).toEqual([
         {
           name: "alpha",
-          id: "alpha.1",
+          id: "alpha.instance.1",
           framework_id: "marathon_1",
           isStartedByMarathon: true
         },
         {
           name: "alpha",
-          id: "alpha.2",
+          id: "alpha.instance.2",
           framework_id: "marathon_1",
           isStartedByMarathon: true
         },
         {
           name: "alpha",
-          id: "alpha.3",
+          id: "alpha.instance.3",
           framework_id: "marathon_1",
           isStartedByMarathon: true
         }
@@ -239,7 +245,7 @@ describe("MesosStateStore", function() {
       expect(tasks).toEqual([
         {
           name: "spark",
-          id: "spark.1",
+          id: "spark.instance.1",
           framework_id: "marathon_1",
           isStartedByMarathon: true,
           sdkTask: true