Repository: aurora Updated Branches: refs/heads/master 78d35269f -> 122780872
Populate the source field of ExecutorInfo. b912e17 stopped populating the source field of the executor. For backwards compatibility we should continue to populate this field and the `source` label. Bugs closed: AURORA-1745 Reviewed at https://reviews.apache.org/r/50826/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/12278087 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/12278087 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/12278087 Branch: refs/heads/master Commit: 1227808728ead63e3f7be246427194cd2f7e6957 Parents: 78d3526 Author: Zameer Manji <[email protected]> Authored: Fri Aug 5 10:54:09 2016 -0700 Committer: Zameer Manji <[email protected]> Committed: Fri Aug 5 10:54:09 2016 -0700 ---------------------------------------------------------------------- RELEASE-NOTES.md | 2 ++ .../org/apache/aurora/scheduler/mesos/MesosTaskFactory.java | 6 +++++- .../aurora/scheduler/mesos/MesosTaskFactoryImplTest.java | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/12278087/RELEASE-NOTES.md ---------------------------------------------------------------------- diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 8c6b860..456ee69 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -27,6 +27,8 @@ the `-custom_executor_config` flag must point to a JSON file which contains at least one valid executor configuration as detailed in the [configuration](http://aurora.apache.org/documentation/latest/operations/configuration/) documentation. +- The `ExecutorInfo.source` field is deprecated and has been replaced with a label named `source`. + It will be removed from Mesos in a future release. ### Deprecations and removals: http://git-wip-us.apache.org/repos/asf/aurora/blob/12278087/src/main/java/org/apache/aurora/scheduler/mesos/MesosTaskFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/mesos/MesosTaskFactory.java b/src/main/java/org/apache/aurora/scheduler/mesos/MesosTaskFactory.java index 3413443..68830ce 100644 --- a/src/main/java/org/apache/aurora/scheduler/mesos/MesosTaskFactory.java +++ b/src/main/java/org/apache/aurora/scheduler/mesos/MesosTaskFactory.java @@ -291,10 +291,13 @@ public interface MesosTaskFactory { .build(); } + @SuppressWarnings("deprecation") // we set the source field for backwards compat. private ExecutorInfo.Builder configureTaskForExecutor( IAssignedTask task, AcceptedOffer acceptedOffer) { + String sourceName = getInstanceSourceName(task.getTask(), task.getInstanceId()); + ExecutorInfo.Builder builder = executorSettings.getExecutorConfig(getExecutorName(task)).get() .getExecutor() @@ -302,11 +305,12 @@ public interface MesosTaskFactory { .setExecutorId(getExecutorId( task.getTaskId(), executorSettings.getExecutorConfig(getExecutorName(task)).get().getTaskPrefix())) + .setSource(sourceName) .setLabels( Labels.newBuilder().addLabels( Label.newBuilder() .setKey(SOURCE_LABEL) - .setValue(getInstanceSourceName(task.getTask(), task.getInstanceId())))); + .setValue(sourceName))); //TODO: (rdelvalle) add output_file when Aurora's Mesos dep is updated (MESOS-4735) List<CommandInfo.URI> mesosFetcherUris = task.getTask().getMesosFetcherUris().stream() http://git-wip-us.apache.org/repos/asf/aurora/blob/12278087/src/test/java/org/apache/aurora/scheduler/mesos/MesosTaskFactoryImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/mesos/MesosTaskFactoryImplTest.java b/src/test/java/org/apache/aurora/scheduler/mesos/MesosTaskFactoryImplTest.java index 7484e8b..b5575a7 100644 --- a/src/test/java/org/apache/aurora/scheduler/mesos/MesosTaskFactoryImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/mesos/MesosTaskFactoryImplTest.java @@ -67,6 +67,7 @@ import static org.apache.aurora.scheduler.base.TaskTestUtil.REVOCABLE_TIER; import static org.apache.aurora.scheduler.mesos.MesosTaskFactory.MesosTaskFactoryImpl.DEFAULT_PORT_PROTOCOL; import static org.apache.aurora.scheduler.mesos.MesosTaskFactory.MesosTaskFactoryImpl.METADATA_LABEL_PREFIX; import static org.apache.aurora.scheduler.mesos.MesosTaskFactory.MesosTaskFactoryImpl.SOURCE_LABEL; +import static org.apache.aurora.scheduler.mesos.MesosTaskFactory.MesosTaskFactoryImpl.getInstanceSourceName; import static org.apache.aurora.scheduler.mesos.MesosTaskFactory.MesosTaskFactoryImpl.getInverseJobSourceName; import static org.apache.aurora.scheduler.mesos.TaskExecutors.NO_OVERHEAD_EXECUTOR; import static org.apache.aurora.scheduler.mesos.TaskExecutors.SOME_OVERHEAD_EXECUTOR; @@ -154,19 +155,18 @@ public class MesosTaskFactoryImplTest extends EasyMockTest { } private static ExecutorInfo populateDynamicFields(ExecutorInfo executor, IAssignedTask task) { + String sourceName = getInstanceSourceName(task.getTask(), task.getInstanceId()); return executor.toBuilder() .clearResources() .setExecutorId(MesosTaskFactoryImpl.getExecutorId( task.getTaskId(), THERMOS_EXECUTOR.getExecutorConfig(executor.getName()).get().getTaskPrefix())) + .setSource(sourceName) .setLabels( Protos.Labels.newBuilder().addLabels( Protos.Label.newBuilder() .setKey(SOURCE_LABEL) - .setValue( - MesosTaskFactoryImpl.getInstanceSourceName( - task.getTask(), - task.getInstanceId())))) + .setValue(sourceName))) .setCommand(executor.getCommand().toBuilder().addAllUris( ImmutableSet.of( URI.newBuilder()
