Merge branch 'stevenschlansker-task-host-underscore' into hs_staging

HubSpot · Apr 9, 2015 · 82851c1 · 82851c1
2 parents 2cf3f35 + 3868da9
commit 82851c1
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/...arityService/src/main/java/com/hubspot/singularity/mesos/SingularityMesosTaskBuilder.java b/...arityService/src/main/java/com/hubspot/singularity/mesos/SingularityMesosTaskBuilder.java
@@ -85,9 +85,9 @@ public SingularityTask buildTask(Protos.Offer offer, List<Resource> availableRes
     }
 
     if (taskRequest.getDeploy().getCustomExecutorCmd().isPresent()) {
-      prepareCustomExecutor(bldr, taskId, taskRequest, ports, desiredExecutorResources);
+      prepareCustomExecutor(bldr, taskId, taskRequest, offer, ports, desiredExecutorResources);
     } else {
-      prepareCommand(bldr, taskId, taskRequest, ports);
+      prepareCommand(bldr, taskId, taskRequest, offer, ports);
     }
 
     if (portsResource.isPresent()) {
@@ -113,11 +113,11 @@ private void setEnv(Environment.Builder envBldr, String key, Object value) {
     envBldr.addVariables(Variable.newBuilder().setName(key).setValue(value.toString()));
   }
 
-  private void prepareEnvironment(final SingularityTaskRequest task, SingularityTaskId taskId, CommandInfo.Builder commandBuilder, final Optional<long[]> ports) {
+  private void prepareEnvironment(final SingularityTaskRequest task, SingularityTaskId taskId, CommandInfo.Builder commandBuilder, final Protos.Offer offer, final Optional<long[]> ports) {
     Environment.Builder envBldr = Environment.newBuilder();
 
     setEnv(envBldr, "INSTANCE_NO", task.getPendingTask().getPendingTaskId().getInstanceNo());
-    setEnv(envBldr, "TASK_HOST", taskId.getHost());
+    setEnv(envBldr, "TASK_HOST", offer.getHostname());
     setEnv(envBldr, "TASK_REQUEST_ID", task.getPendingTask().getPendingTaskId().getRequestId());
     setEnv(envBldr, "TASK_DEPLOY_ID", taskId.getDeployId());
     setEnv(envBldr, "ESTIMATED_INSTANCE_COUNT", task.getRequest().getInstancesSafe());
@@ -241,10 +241,10 @@ private List<Resource> buildMesosResources(final Resources resources) {
     return builder.build();
   }
 
-  private void prepareCustomExecutor(final TaskInfo.Builder bldr, final SingularityTaskId taskId, final SingularityTaskRequest task, final Optional<long[]> ports, final Resources desiredExecutorResources) {
+  private void prepareCustomExecutor(final TaskInfo.Builder bldr, final SingularityTaskId taskId, final SingularityTaskRequest task, final Protos.Offer offer, final Optional<long[]> ports, final Resources desiredExecutorResources) {
     CommandInfo.Builder commandBuilder = CommandInfo.newBuilder().setValue(task.getDeploy().getCustomExecutorCmd().get());
 
-    prepareEnvironment(task, taskId, commandBuilder, ports);
+    prepareEnvironment(task, taskId, commandBuilder, offer, ports);
 
     bldr.setExecutor(ExecutorInfo.newBuilder()
             .setCommand(commandBuilder.build())
@@ -285,7 +285,7 @@ private void prepareCustomExecutor(final TaskInfo.Builder bldr, final Singularit
   }
 
 
-  private void prepareCommand(final TaskInfo.Builder bldr, final SingularityTaskId taskId, final SingularityTaskRequest task, final Optional<long[]> ports) {
+  private void prepareCommand(final TaskInfo.Builder bldr, final SingularityTaskId taskId, final SingularityTaskRequest task, final Protos.Offer offer, final Optional<long[]> ports) {
     CommandInfo.Builder commandBldr = CommandInfo.newBuilder();
 
     if (task.getDeploy().getCommand().isPresent()) {
@@ -309,7 +309,7 @@ private void prepareCommand(final TaskInfo.Builder bldr, final SingularityTaskId
       commandBldr.addUris(URI.newBuilder().setValue(uri).build());
     }
 
-    prepareEnvironment(task, taskId, commandBldr, ports);
+    prepareEnvironment(task, taskId, commandBldr, offer, ports);
 
     bldr.setCommand(commandBldr);
   }