Repository: hadoop Updated Branches: refs/heads/branch-2.8.0 cf91cc2b0 -> e53c4a6d6
YARN-6200. Reverting since the same functionality achieved by YARN-1623 Revert "YARN-5068. Expose scheduler queue to application master. (Harish Jaiprakash via rohithsharmaks)" This reverts commit f102c4f6c8b5a38f73e41282215e9bc38240eed8. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e53c4a6d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e53c4a6d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e53c4a6d Branch: refs/heads/branch-2.8.0 Commit: e53c4a6d69fdfcdc41afa38e51f1d9a06fb10f2a Parents: cf91cc2 Author: Rohith Sharma K S <[email protected]> Authored: Thu Feb 16 17:47:46 2017 +0530 Committer: Rohith Sharma K S <[email protected]> Committed: Thu Feb 16 17:47:46 2017 +0530 ---------------------------------------------------------------------- .../hadoop/yarn/api/ApplicationConstants.java | 7 ------- .../resourcemanager/amlauncher/AMLauncher.java | 16 +--------------- .../TestApplicationMasterLauncher.java | 5 ----- 3 files changed, 1 insertion(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e53c4a6d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationConstants.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationConstants.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationConstants.java index ad526d6..b2d765a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationConstants.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationConstants.java @@ -171,13 +171,6 @@ public interface ApplicationConstants { LD_LIBRARY_PATH("LD_LIBRARY_PATH"), /** - * $YARN_RESOURCEMANAGER_APPLICATION_QUEUE - * The queue into which the app was submitted/launched. - */ - YARN_RESOURCEMANAGER_APPLICATION_QUEUE( - "YARN_RESOURCEMANAGER_APPLICATION_QUEUE"), - - /** * $HADOOP_CONF_DIR * Final, non-modifiable. */ http://git-wip-us.apache.org/repos/asf/hadoop/blob/e53c4a6d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java index e513198..a81648b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java @@ -51,7 +51,6 @@ import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.client.NMProxy; -import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.event.EventHandler; import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.ipc.YarnRPC; @@ -187,25 +186,12 @@ public class AMLauncher implements Runnable { ContainerLaunchContext container = applicationMasterContext.getAMContainerSpec(); - // Populate the current queue name in the environment variable. - setupQueueNameEnv(container, applicationMasterContext); - // Finalize the container setupTokens(container, containerID); - + return container; } - private void setupQueueNameEnv(ContainerLaunchContext container, - ApplicationSubmissionContext applicationMasterContext) { - String queueName = applicationMasterContext.getQueue(); - if (queueName == null) { - queueName = YarnConfiguration.DEFAULT_QUEUE_NAME; - } - container.getEnvironment().put(ApplicationConstants.Environment - .YARN_RESOURCEMANAGER_APPLICATION_QUEUE.key(), queueName); - } - @Private @VisibleForTesting protected void setupTokens( http://git-wip-us.apache.org/repos/asf/hadoop/blob/e53c4a6d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java index 99ad9f6..9e959235 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java @@ -94,7 +94,6 @@ public class TestApplicationMasterLauncher { String nmHostAtContainerManager = null; long submitTimeAtContainerManager; int maxAppAttempts; - private String queueName; @Override public StartContainersResponse @@ -124,8 +123,6 @@ public class TestApplicationMasterLauncher { Long.parseLong(env.get(ApplicationConstants.APP_SUBMIT_TIME_ENV)); maxAppAttempts = Integer.parseInt(env.get(ApplicationConstants.MAX_APP_ATTEMPTS_ENV)); - queueName = env.get(ApplicationConstants.Environment - .YARN_RESOURCEMANAGER_APPLICATION_QUEUE.key()); return StartContainersResponse.newInstance( new HashMap<String, ByteBuffer>(), new ArrayList<ContainerId>(), new HashMap<ContainerId, SerializedException>()); @@ -194,8 +191,6 @@ public class TestApplicationMasterLauncher { containerManager.nmHostAtContainerManager); Assert.assertEquals(YarnConfiguration.DEFAULT_RM_AM_MAX_ATTEMPTS, containerManager.maxAppAttempts); - Assert.assertEquals(YarnConfiguration.DEFAULT_QUEUE_NAME, - containerManager.queueName); MockAM am = new MockAM(rm.getRMContext(), rm .getApplicationMasterService(), appAttemptId); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
