Merge pull request #494 from mesos/bug/executor-name

Executor name now uses Executor ID
mesos · Feb 10, 2016 · 50cfefb · 50cfefb
2 parents 6691f32 + bb57288
commit 50cfefb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/TaskInfoFactory.java b/scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/TaskInfoFactory.java
@@ -102,11 +102,11 @@ public ByteString toData(String hostname, String ipAddress, ZonedDateTime zonedD
     }
 
     private Protos.ExecutorInfo.Builder newExecutorInfo(Configuration configuration) {
-        Protos.ExecutorInfo.Builder executorInfoBuilder = Protos.ExecutorInfo.newBuilder()
-                .setExecutorId(Protos.ExecutorID.newBuilder().setValue(UUID.randomUUID().toString()))
-                .setFrameworkId(frameworkState.getFrameworkID())
-                .setName("elasticsearch-executor-" + UUID.randomUUID().toString())
-                .setCommand(newCommandInfo(configuration));
+        Protos.ExecutorInfo.Builder executorInfoBuilder = Protos.ExecutorInfo.newBuilder();
+        executorInfoBuilder.setExecutorId(Protos.ExecutorID.newBuilder().setValue(UUID.randomUUID().toString()))
+                           .setFrameworkId(frameworkState.getFrameworkID())
+                           .setName("elasticsearch-executor-" + executorInfoBuilder.getExecutorId().getValue())
+                           .setCommand(newCommandInfo(configuration));
         if (configuration.isFrameworkUseDocker()) {
             Protos.ContainerInfo.DockerInfo.Builder containerBuilder = Protos.ContainerInfo.DockerInfo.newBuilder()
                     .setImage(configuration.getExecutorImage())

diff --git a/scheduler/src/test/java/org/apache/mesos/elasticsearch/scheduler/TaskInfoFactoryTest.java b/scheduler/src/test/java/org/apache/mesos/elasticsearch/scheduler/TaskInfoFactoryTest.java
@@ -101,6 +101,7 @@ public void testCreateTaskInfo() {
 
         assertEquals(frameworkState.getFrameworkID(), taskInfo.getExecutor().getFrameworkId());
         assertEquals(Configuration.DEFAULT_EXECUTOR_IMAGE, taskInfo.getExecutor().getContainer().getDocker().getImage());
+        assertEquals("elasticsearch-executor-" + taskInfo.getExecutor().getExecutorId().getValue(), taskInfo.getExecutor().getName());
 
         assertEquals(2, taskInfo.getExecutor().getContainer().getVolumesCount());
         assertEquals(CONTAINER_PATH_SETTINGS, taskInfo.getExecutor().getContainer().getVolumes(0).getContainerPath());