tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject git commit: TEZ-156. Fix build break due to removal of BuilderUtils
Date Fri, 24 May 2013 17:14:12 GMT
Updated Branches:
  refs/heads/TEZ-1 5d8adeb52 -> b5ebd4923


TEZ-156. Fix build break due to removal of BuilderUtils


Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/b5ebd492
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/b5ebd492
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/b5ebd492

Branch: refs/heads/TEZ-1
Commit: b5ebd4923729dd3f0eb77339f2f1338265153588
Parents: 5d8adeb
Author: Hitesh Shah <hitesh@apache.org>
Authored: Fri May 24 10:13:42 2013 -0700
Committer: Hitesh Shah <hitesh@apache.org>
Committed: Fri May 24 10:13:42 2013 -0700

----------------------------------------------------------------------
 .../dag/app/rm/container/AMContainerHelpers.java   |   14 ++++++--------
 .../org/apache/tez/mapreduce/NotRunningJob.java    |    6 +++---
 .../java/org/apache/tez/mapreduce/YARNRunner.java  |    7 +++----
 3 files changed, 12 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b5ebd492/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
index 0550895..6a9ae2e 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
@@ -136,10 +136,9 @@ public class AMContainerHelpers {
     // Construct the actual Container
     // The null fields are per-container and will be constructed for each
     // container separately.
-    ContainerLaunchContext container = BuilderUtils.newContainerLaunchContext(
-        appContext.getDAG().getUserName(), localResources,
-        environment, null, serviceData, taskCredentialsBuffer, applicationACLs);
-
+    ContainerLaunchContext container =
+        ContainerLaunchContext.newInstance(localResources, environment, null,
+            serviceData, taskCredentialsBuffer, applicationACLs);
     return container;
   }
 
@@ -188,10 +187,9 @@ public class AMContainerHelpers {
     }
 
     // Construct the actual Container
-    ContainerLaunchContext container = BuilderUtils.newContainerLaunchContext(
-        commonContainerSpec.getUser(), lResources, myEnv, commands,
-        myServiceData, commonContainerSpec.getTokens().duplicate(),
-        acls);
+    ContainerLaunchContext container =
+        ContainerLaunchContext.newInstance(lResources, myEnv, commands,
+            myServiceData, commonContainerSpec.getTokens(), acls);
 
     return container;
   }

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b5ebd492/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/NotRunningJob.java
----------------------------------------------------------------------
diff --git a/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/NotRunningJob.java b/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/NotRunningJob.java
index 370c8f0..ba7ab5a 100644
--- a/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/NotRunningJob.java
+++ b/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/NotRunningJob.java
@@ -87,9 +87,9 @@ public class NotRunningJob implements MRClientProtocol {
 
     // Setting AppState to NEW and finalStatus to UNDEFINED as they are never
     // used for a non running job
-    return BuilderUtils.newApplicationReport(unknownAppId, unknownAttemptId,
-        "N/A", "N/A", "N/A", "N/A", 0, null, YarnApplicationState.NEW, "N/A",
-        "N/A", 0, 0, FinalApplicationStatus.UNDEFINED, null, "N/A", 0.0f);
+    return ApplicationReport.newInstance(unknownAppId, unknownAttemptId, "N/A",
+        "N/A", "N/A", "N/A", 0, null, YarnApplicationState.NEW, "N/A", "N/A",
+        0, 0, FinalApplicationStatus.UNDEFINED, null, "N/A", 0.0f, "TEZ_MRR");
   }
 
   NotRunningJob(ApplicationReport applicationReport, JobState jobState) {

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b5ebd492/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/YARNRunner.java
----------------------------------------------------------------------
diff --git a/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/YARNRunner.java b/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/YARNRunner.java
index 9ece649..a79a4f9 100644
--- a/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/YARNRunner.java
+++ b/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/YARNRunner.java
@@ -816,10 +816,9 @@ public class YARNRunner implements ClientProtocol {
         = new HashMap<ApplicationAccessType, String>();
 
     // Setup ContainerLaunchContext for AM container
-    ContainerLaunchContext amContainer = BuilderUtils
-        .newContainerLaunchContext(UserGroupInformation
-            .getCurrentUser().getShortUserName(), localResources,
-            environment, vargsFinal, null, securityTokens, acls);
+    ContainerLaunchContext amContainer =
+        ContainerLaunchContext.newInstance(localResources, environment,
+            vargsFinal, null, securityTokens, acls);
 
     // Set up the ApplicationSubmissionContext
     ApplicationSubmissionContext appContext = Records


Mime
View raw message