浏览代码

Removed accidental debugging code.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.4@1395579 13f79535-47bb-0310-9956-ffa450edef68
Robert Joseph Evans 12 年之前
父节点
当前提交
a01ee65afc

+ 1 - 4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java

@@ -742,12 +742,9 @@ public abstract class TaskAttemptImpl implements
       myServiceData.put(entry.getKey(), entry.getValue().duplicate());
     }
 
-    String user = conf.get("hack.me.again", commonContainerSpec.getUser());
-
-    LOG.warn("Launching task as user "+user);
     // Construct the actual Container
     ContainerLaunchContext container = BuilderUtils.newContainerLaunchContext(
-        containerID, user, assignedCapability,
+        containerID, commonContainerSpec.getUser(), assignedCapability,
         commonContainerSpec.getLocalResources(), myEnv, commands,
         myServiceData, commonContainerSpec.getContainerTokens().duplicate(),
         applicationACLs);

+ 1 - 5
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java

@@ -436,12 +436,8 @@ public class YARNRunner implements ClientProtocol {
     ApplicationSubmissionContext appContext =
         recordFactory.newRecordInstance(ApplicationSubmissionContext.class);
     appContext.setApplicationId(applicationId);                // ApplicationId
-    //TODO change this
-    String user = conf.get("hack.me", 
-        UserGroupInformation.getCurrentUser().getShortUserName());
-    LOG.warn("launching app as user "+user);
     appContext.setUser(                                        // User name
-        user);
+      UserGroupInformation.getCurrentUser().getShortUserName());
     appContext.setQueue(                                       // Queue name
         jobConf.get(JobContext.QUEUE_NAME,
         YarnConfiguration.DEFAULT_QUEUE_NAME));