hadoop git commit: YARN-6200. Reverting since the same functionality achieved by YARN-1623. Revert "YARN-5068. Expose scheduler queue to application master. (Harish Jaiprakash via rohithsharmaks)"
Repository: hadoop Updated Branches: refs/heads/trunk 74dd14225 -> a393e84c6 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 b7ac85259c7d20c33bef9c9cb40b8aabcab70755. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a393e84c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a393e84c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a393e84c Branch: refs/heads/trunk Commit: a393e84c6f57d50a471fc902dfd07ca1b4128a0e Parents: 74dd142 Author: Rohith Sharma K SAuthored: Thu Feb 16 18:00:25 2017 +0530 Committer: Rohith Sharma K S Committed: Thu Feb 16 18:00:25 2017 +0530 -- .../apache/hadoop/yarn/api/ApplicationConstants.java | 7 --- .../server/resourcemanager/amlauncher/AMLauncher.java | 14 -- .../TestApplicationMasterLauncher.java| 5 - 3 files changed, 26 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a393e84c/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 760e251..64bcc44 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 @@ -160,13 +160,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/a393e84c/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 d33360b..05f9f47 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; @@ -189,9 +188,6 @@ 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); // set the flow context optionally for timeline service v.2 @@ -200,16 +196,6 @@ public class AMLauncher implements Runnable { 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(
hadoop git commit: YARN-6200. Reverting since the same functionality achieved by YARN-1623. Revert "YARN-5068. Expose scheduler queue to application master. (Harish Jaiprakash via rohithsharmaks)"
Repository: hadoop Updated Branches: refs/heads/branch-2 9fecd5063 -> f07b52dc5 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 a37b3694ead2ab4e8753e68213f31868b68376b8. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f07b52dc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f07b52dc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f07b52dc Branch: refs/heads/branch-2 Commit: f07b52dc5ae117a337b71829ffbd8cce8d6ad49f Parents: 9fecd50 Author: Rohith Sharma K SAuthored: Thu Feb 16 17:58:38 2017 +0530 Committer: Rohith Sharma K S Committed: Thu Feb 16 17:58:38 2017 +0530 -- .../apache/hadoop/yarn/api/ApplicationConstants.java | 7 --- .../server/resourcemanager/amlauncher/AMLauncher.java | 14 -- .../TestApplicationMasterLauncher.java| 5 - 3 files changed, 26 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f07b52dc/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 168e291..6bd984b 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/f07b52dc/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..8b44bd9 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(
hadoop git commit: YARN-6200. Reverting since the same functionality achieved by YARN-1623. Revert "YARN-5068. Expose scheduler queue to application master. (Harish Jaiprakash via rohithsharmaks)"
Repository: hadoop Updated Branches: refs/heads/branch-2.8 4c47cb68e -> da944fe0f 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/da944fe0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/da944fe0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/da944fe0 Branch: refs/heads/branch-2.8 Commit: da944fe0f44e2bb2cd63c65aaa79f7d28ca6313a Parents: 4c47cb6 Author: Rohith Sharma K SAuthored: Thu Feb 16 17:54:37 2017 +0530 Committer: Rohith Sharma K S Committed: Thu Feb 16 17:54:37 2017 +0530 -- .../apache/hadoop/yarn/api/ApplicationConstants.java | 7 --- .../server/resourcemanager/amlauncher/AMLauncher.java | 14 -- .../TestApplicationMasterLauncher.java| 5 - 3 files changed, 26 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/da944fe0/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/da944fe0/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..8b44bd9 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(
hadoop git commit: YARN-6200. Reverting since the same functionality achieved by YARN-1623 Revert "YARN-5068. Expose scheduler queue to application master. (Harish Jaiprakash via rohithsharmaks)"
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 SAuthored: Thu Feb 16 17:47:46 2017 +0530 Committer: Rohith Sharma K S 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(