big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-6200. Reverting since the same functionality achieved by YARN-1623.

Browse Source 
Revert "YARN-5068. Expose scheduler queue to application master. (Harish Jaiprakash via rohithsharmaks)"

This reverts commit b7ac85259c.
This commit is contained in:
Rohith Sharma K S 2017-02-16 18:00:25 +05:30
parent 74dd142250
commit a393e84c6f
3 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationConstants.java
View File

@ -159,13 +159,6 @@ public enum Environment {
*/ */
LD_LIBRARY_PATH("LD_LIBRARY_PATH"), 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 * $HADOOP_CONF_DIR
* Final, non-modifiable. * Final, non-modifiable.

14
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java
View File

@ -51,7 +51,6 @@
import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.NodeId;
import org.apache.hadoop.yarn.client.NMProxy; 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.event.EventHandler;
import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.hadoop.yarn.ipc.YarnRPC; import org.apache.hadoop.yarn.ipc.YarnRPC;
@ -189,9 +188,6 @@ private ContainerLaunchContext createAMContainerLaunchContext(
ContainerLaunchContext container = ContainerLaunchContext container =
applicationMasterContext.getAMContainerSpec(); applicationMasterContext.getAMContainerSpec();
// Populate the current queue name in the environment variable.
setupQueueNameEnv(container, applicationMasterContext);
// Finalize the container // Finalize the container
setupTokens(container, containerID); setupTokens(container, containerID);
// set the flow context optionally for timeline service v.2 // set the flow context optionally for timeline service v.2
@ -200,16 +196,6 @@ private ContainerLaunchContext createAMContainerLaunchContext(
return container; 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 @Private
@VisibleForTesting @VisibleForTesting
protected void setupTokens( protected void setupTokens(

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java
View File

@ -101,7 +101,6 @@ private static final class MyContainerManagerImpl implements
String nmHostAtContainerManager = null; String nmHostAtContainerManager = null;
long submitTimeAtContainerManager; long submitTimeAtContainerManager;
int maxAppAttempts; int maxAppAttempts;
private String queueName;
@Override @Override
public StartContainersResponse public StartContainersResponse
@ -130,8 +129,6 @@ private static final class MyContainerManagerImpl implements
submitTimeAtContainerManager = submitTimeAtContainerManager =
Long.parseLong(env.get(ApplicationConstants.APP_SUBMIT_TIME_ENV)); Long.parseLong(env.get(ApplicationConstants.APP_SUBMIT_TIME_ENV));
maxAppAttempts = YarnConfiguration.DEFAULT_RM_AM_MAX_ATTEMPTS; maxAppAttempts = YarnConfiguration.DEFAULT_RM_AM_MAX_ATTEMPTS;
queueName = env.get(ApplicationConstants.Environment
.YARN_RESOURCEMANAGER_APPLICATION_QUEUE.key());
return StartContainersResponse.newInstance( return StartContainersResponse.newInstance(
new HashMap<String, ByteBuffer>(), new ArrayList<ContainerId>(), new HashMap<String, ByteBuffer>(), new ArrayList<ContainerId>(),
new HashMap<ContainerId, SerializedException>()); new HashMap<ContainerId, SerializedException>());
@ -231,8 +228,6 @@ public void testAMLaunchAndCleanup() throws Exception {
containerManager.nmHostAtContainerManager); containerManager.nmHostAtContainerManager);
Assert.assertEquals(YarnConfiguration.DEFAULT_RM_AM_MAX_ATTEMPTS, Assert.assertEquals(YarnConfiguration.DEFAULT_RM_AM_MAX_ATTEMPTS,
containerManager.maxAppAttempts); containerManager.maxAppAttempts);
Assert.assertEquals(YarnConfiguration.DEFAULT_QUEUE_NAME,
containerManager.queueName);
MockAM am = new MockAM(rm.getRMContext(), rm MockAM am = new MockAM(rm.getRMContext(), rm
.getApplicationMasterService(), appAttemptId); .getApplicationMasterService(), appAttemptId);