tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlidd...@apache.org
Subject git commit: TEZ-196: change TezConfiguration names from DAG* to TEZ*
Date Sat, 22 Jun 2013 00:09:57 GMT
Updated Branches:
  refs/heads/master d7fa15421 -> c6eb9032a


TEZ-196: change TezConfiguration names from DAG* to TEZ*


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

Branch: refs/heads/master
Commit: c6eb9032a24a7fd0d06008d80a059b482f1a8a78
Parents: d7fa154
Author: Mike Liddell <mliddell@apache.org>
Authored: Fri Jun 21 17:09:42 2013 -0700
Committer: Mike Liddell <mliddell@apache.org>
Committed: Fri Jun 21 17:09:42 2013 -0700

----------------------------------------------------------------------
 .../java/org/apache/tez/client/TezClient.java   | 20 +++----
 .../apache/tez/dag/api/TezConfiguration.java    | 56 ++++++++++----------
 .../apache/hadoop/mapred/YarnTezDagChild.java   |  2 +-
 .../tez/dag/api/client/DAGClientServer.java     |  6 +--
 .../org/apache/tez/dag/app/DAGAppMaster.java    | 10 ++--
 .../dag/app/TaskAttemptListenerImpTezDag.java   |  4 +-
 .../apache/tez/dag/app/dag/impl/DAGImpl.java    |  4 +-
 .../apache/tez/dag/app/dag/impl/TaskImpl.java   |  4 +-
 .../app/rm/container/AMContainerHelpers.java    |  8 +--
 .../apache/tez/dag/app/rm/node/AMNodeMap.java   | 12 ++---
 .../java/org/apache/tez/dag/utils/DAGApps.java  |  4 +-
 .../tez/mapreduce/hadoop/DeprecatedKeys.java    |  8 +--
 12 files changed, 69 insertions(+), 69 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/c6eb9032/tez-dag-api/src/main/java/org/apache/tez/client/TezClient.java
----------------------------------------------------------------------
diff --git a/tez-dag-api/src/main/java/org/apache/tez/client/TezClient.java b/tez-dag-api/src/main/java/org/apache/tez/client/TezClient.java
index 90f1e81..0147cbb 100644
--- a/tez-dag-api/src/main/java/org/apache/tez/client/TezClient.java
+++ b/tez-dag-api/src/main/java/org/apache/tez/client/TezClient.java
@@ -380,11 +380,11 @@ public class TezClient {
     // Setup resource requirements
     Resource capability = Records.newRecord(Resource.class);
     capability.setMemory(
-        conf.getInt(TezConfiguration.DAG_AM_RESOURCE_MEMORY_MB,
-            TezConfiguration.DEFAULT_DAG_AM_RESOURCE_MEMORY_MB));
+        conf.getInt(TezConfiguration.TEZ_AM_RESOURCE_MEMORY_MB,
+            TezConfiguration.DEFAULT_TEZ_AM_RESOURCE_MEMORY_MB));
     capability.setVirtualCores(
-        conf.getInt(TezConfiguration.DAG_AM_RESOURCE_CPU_VCORES,
-            TezConfiguration.DEFAULT_DAG_AM_RESOURCE_CPU_VCORES));
+        conf.getInt(TezConfiguration.TEZ_AM_RESOURCE_CPU_VCORES,
+            TezConfiguration.DEFAULT_TEZ_AM_RESOURCE_CPU_VCORES));
     LOG.debug("AppMaster capability = " + capability);
 
     ByteBuffer securityTokens = null;
@@ -406,7 +406,7 @@ public class TezClient {
     
     vargs.addAll(amArgs);
 
-    vargs.add(TezConfiguration.DAG_APPLICATION_MASTER_CLASS);
+    vargs.add(TezConfiguration.TEZ_APPLICATION_MASTER_CLASS);
     vargs.add("1>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR +
         File.separator + ApplicationConstants.STDOUT);
     vargs.add("2>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR +
@@ -472,8 +472,8 @@ public class TezClient {
     
     // emit protobuf DAG file style
     Path binaryPath =  new Path(appStagingDir,
-        TezConfiguration.DAG_AM_PLAN_PB_BINARY + "." + appId.toString());
-    amConf.set(TezConfiguration.DAG_AM_PLAN_REMOTE_PATH, binaryPath.toUri()
+        TezConfiguration.TEZ_AM_PLAN_PB_BINARY + "." + appId.toString());
+    amConf.set(TezConfiguration.TEZ_AM_PLAN_REMOTE_PATH, binaryPath.toUri()
         .toString());
 
     Configuration finalAMConf = createFinalAMConf(amConf);
@@ -493,13 +493,13 @@ public class TezClient {
       }
     }
 
-    localResources.put(TezConfiguration.DAG_AM_PLAN_PB_BINARY,
+    localResources.put(TezConfiguration.TEZ_AM_PLAN_PB_BINARY,
         createApplicationResource(fs,
             binaryPath, LocalResourceType.FILE));
 
     if (Level.DEBUG.isGreaterOrEqual(Level.toLevel(amLogLevel))) {
       Path textPath = localizeDagPlanAsText(dagPB, fs, appStagingDir, appId);
-      localResources.put(TezConfiguration.DAG_AM_PLAN_PB_TEXT,
+      localResources.put(TezConfiguration.TEZ_AM_PLAN_PB_TEXT,
           createApplicationResource(fs, textPath, LocalResourceType.FILE));
     }
     
@@ -531,7 +531,7 @@ public class TezClient {
   private Path localizeDagPlanAsText(DAGPlan dagPB, FileSystem fs,
       Path appStagingDir, ApplicationId appId) throws IOException {
     Path textPath = new Path(appStagingDir,
-        TezConfiguration.DAG_AM_PLAN_PB_TEXT + "." + appId.toString());
+        TezConfiguration.TEZ_AM_PLAN_PB_TEXT + "." + appId.toString());
     FSDataOutputStream dagPBOutTextStream = null;
     try {
       dagPBOutTextStream = FileSystem.create(fs, textPath, new FsPermission(

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/c6eb9032/tez-dag-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
----------------------------------------------------------------------
diff --git a/tez-dag-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java b/tez-dag-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
index f8652f5..58a1023 100644
--- a/tez-dag-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
+++ b/tez-dag-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
@@ -39,13 +39,13 @@ public class TezConfiguration extends Configuration {
   public static final String TEZ_PREFIX = "tez.";
   public static final String TEZ_AM_PREFIX = TEZ_PREFIX + "dag.am.";
 
-  public static final String DAG_AM_STAGING_DIR = TEZ_PREFIX + "staging-dir";
-  public static final String DAG_AM_STAGING_DIR_DEFAULT = "/tmp/hadoop-yarn/staging";
+  public static final String TEZ_AM_STAGING_DIR = TEZ_PREFIX + "staging-dir";
+  public static final String TEZ_AM_STAGING_DIR_DEFAULT = "/tmp/hadoop-yarn/staging";
 
   // TODO Should not be required once all tokens are handled via AppSubmissionContext
   public static final String JOB_SUBMIT_DIR = TEZ_PREFIX + "jobSubmitDir";
   public static final String APPLICATION_TOKENS_FILE = "appTokens";
-  public static final String DAG_APPLICATION_MASTER_CLASS =
+  public static final String TEZ_APPLICATION_MASTER_CLASS =
       "org.apache.tez.dag.app.DAGAppMaster";
 
   /** Root Logging level passed to the Tez app master.*/
@@ -56,50 +56,50 @@ public class TezConfiguration extends Configuration {
       "am.complete.cancel.delegation.tokens";
   public static final boolean DEFAULT_TEZ_AM_CANCEL_DELEGATION_TOKEN = true;
 
-  public static final String DAG_AM_TASK_LISTENER_THREAD_COUNT =
+  public static final String TEZ_AM_TASK_LISTENER_THREAD_COUNT =
                                 TEZ_PREFIX + "task.listener.thread-count";
-  public static final int DAG_AM_TASK_LISTENER_THREAD_COUNT_DEFAULT = 30;
+  public static final int TEZ_AM_TASK_LISTENER_THREAD_COUNT_DEFAULT = 30;
 
-  public static final String DAG_AM_CONTAINER_LISTENER_THREAD_COUNT =
+  public static final String TEZ_AM_CONTAINER_LISTENER_THREAD_COUNT =
       TEZ_PREFIX + "container.listener.thread-count";
-  public static final int DAG_AM_CONTAINER_LISTENER_THREAD_COUNT_DEFAULT = 30;
+  public static final int TEZ_AM_CONTAINER_LISTENER_THREAD_COUNT_DEFAULT = 30;
 
   // TODO Some of the DAG properties are job specific and not AM specific. Rename accordingly.
   // TODO Are any of these node blacklisting properties required. (other than for MR compat)
-  public static final String DAG_MAX_TASK_FAILURES_PER_NODE = TEZ_PREFIX
+  public static final String TEZ_MAX_TASK_FAILURES_PER_NODE = TEZ_PREFIX
       + "maxtaskfailures.per.node";
-  public static final int DAG_MAX_TASK_FAILURES_PER_NODE_DEFAULT = 3;
+  public static final int TEZ_MAX_TASK_FAILURES_PER_NODE_DEFAULT = 3;
 
-  public static final String DAG_MAX_TASK_ATTEMPTS =
+  public static final String TEZ_MAX_TASK_ATTEMPTS =
       TEZ_AM_PREFIX + "max.task.attempts";
-  public static final int DAG_MAX_TASK_ATTEMPTS_DEFAULT = 4;
+  public static final int TEZ_MAX_TASK_ATTEMPTS_DEFAULT = 4;
 
-  public static final String DAG_NODE_BLACKLISTING_ENABLED = TEZ_PREFIX
+  public static final String TEZ_NODE_BLACKLISTING_ENABLED = TEZ_PREFIX
       + "node-blacklisting.enabled";
-  public static final boolean DAG_NODE_BLACKLISTING_ENABLED_DEFAULT = true;
-  public static final String DAG_NODE_BLACKLISTING_IGNORE_THRESHOLD = TEZ_PREFIX
+  public static final boolean TEZ_NODE_BLACKLISTING_ENABLED_DEFAULT = true;
+  public static final String TEZ_NODE_BLACKLISTING_IGNORE_THRESHOLD = TEZ_PREFIX
       + "node-blacklisting.ignore-threshold-node-percent";
-  public static final int DAG_NODE_BLACKLISTING_IGNORE_THRESHOLD_DEFAULT = 33;
+  public static final int TEZ_NODE_BLACKLISTING_IGNORE_THRESHOLD_DEFAULT = 33;
 
   /** Number of threads to handle job client RPC requests.*/
-  public static final String DAG_CLIENT_AM_THREAD_COUNT =
+  public static final String TEZ_CLIENT_AM_THREAD_COUNT =
                                     TEZ_PREFIX + "client.am.thread-count";
-  public static final int DAG_CLIENT_AM__THREAD_COUNT_DEFAULT = 1;
+  public static final int TEZ_CLIENT_AM__THREAD_COUNT_DEFAULT = 1;
   /**
    * Range of ports that the AM can use when binding. Leave blank
    * if you want all possible ports.
    */
-  public static final String DAG_CLIENT_AM_PORT_RANGE =
+  public static final String TEZ_CLIENT_AM_PORT_RANGE =
                                     TEZ_PREFIX + "client.am.port-range";
 
 
-  public static final String DAG_AM_RESOURCE_MEMORY_MB = TEZ_AM_PREFIX
+  public static final String TEZ_AM_RESOURCE_MEMORY_MB = TEZ_AM_PREFIX
       + "resource.memory.mb";
-  public static final int DEFAULT_DAG_AM_RESOURCE_MEMORY_MB = 1536;
+  public static final int DEFAULT_TEZ_AM_RESOURCE_MEMORY_MB = 1536;
 
-  public static final String DAG_AM_RESOURCE_CPU_VCORES = TEZ_AM_PREFIX
+  public static final String TEZ_AM_RESOURCE_CPU_VCORES = TEZ_AM_PREFIX
       + "resource.cpu.vcores";
-  public static final int DEFAULT_DAG_AM_RESOURCE_CPU_VCORES = 1;
+  public static final int DEFAULT_TEZ_AM_RESOURCE_CPU_VCORES = 1;
 
   public static final String
           SLOWSTART_VERTEX_SCHEDULER_MIN_SRC_FRACTION = TEZ_PREFIX
@@ -114,22 +114,22 @@ public class TezConfiguration extends Configuration {
           SLOWSTART_VERTEX_SCHEDULER_MAX_SRC_FRACTION_DEFAULT = 0.75f;
   
   public static final String 
-          SLOWSTART_DAG_SCHEDULER_MIN_SHUFFLE_RESOURCE_FRACTION = TEZ_AM_PREFIX
+          SLOWSTART_TEZ_SCHEDULER_MIN_SHUFFLE_RESOURCE_FRACTION = TEZ_AM_PREFIX
           + "slowstart-dag-scheduler.min-resource-fraction";
   public static final float 
-          SLOWSTART_DAG_SCHEDULER_MIN_SHUFFLE_RESOURCE_FRACTION_DEFAULT = 0.5f;
+          SLOWSTART_TEZ_SCHEDULER_MIN_SHUFFLE_RESOURCE_FRACTION_DEFAULT = 0.5f;
 
   /**
    * The complete path to the serialized dag plan file
-   * <code>DAG_AM_PLAN_PB_BINARY</code>. Used to make the plan available to
+   * <code>TEZ_AM_PLAN_PB_BINARY</code>. Used to make the plan available to
    * individual tasks. This will typically be a path in the job submit
    * directory.
    */
-  public static final String DAG_AM_PLAN_REMOTE_PATH = TEZ_PREFIX
+  public static final String TEZ_AM_PLAN_REMOTE_PATH = TEZ_PREFIX
       + "dag-am-plan.remote.path";
 
-  public static final String DAG_AM_PLAN_PB_BINARY = "tez-dag.pb";
-  public static final String DAG_AM_PLAN_PB_TEXT = "tez-dag.pb.txt";
+  public static final String TEZ_AM_PLAN_PB_BINARY = "tez-dag.pb";
+  public static final String TEZ_AM_PLAN_PB_TEXT = "tez-dag.pb.txt";
 
   public static final String TEZ_LIB_URIS =
       TEZ_PREFIX + "lib.uris";

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/c6eb9032/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java b/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java
index dc5968b..4ff68af 100644
--- a/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java
+++ b/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java
@@ -298,7 +298,7 @@ public class YarnTezDagChild {
     FileInputStream dagPBBinaryStream = null;
     try {
       dagPBBinaryStream = new FileInputStream(
-          TezConfiguration.DAG_AM_PLAN_PB_BINARY);
+          TezConfiguration.TEZ_AM_PLAN_PB_BINARY);
       dagPlanBuilder.mergeFrom(dagPBBinaryStream);
     } finally {
       if (dagPBBinaryStream != null) {

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/c6eb9032/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientServer.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientServer.java b/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientServer.java
index afd8bec..ccd8198 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientServer.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientServer.java
@@ -63,10 +63,10 @@ public class DAGClientServer extends AbstractService {
       BlockingService blockingService = 
                 DAGClientAMProtocol.newReflectiveBlockingService(service);
       
-      int numHandlers = conf.getInt(TezConfiguration.DAG_CLIENT_AM_THREAD_COUNT, 
-                          TezConfiguration.DAG_CLIENT_AM__THREAD_COUNT_DEFAULT);
+      int numHandlers = conf.getInt(TezConfiguration.TEZ_CLIENT_AM_THREAD_COUNT, 
+                          TezConfiguration.TEZ_CLIENT_AM__THREAD_COUNT_DEFAULT);
       
-      String portRange = conf.get(TezConfiguration.DAG_CLIENT_AM_PORT_RANGE);
+      String portRange = conf.get(TezConfiguration.TEZ_CLIENT_AM_PORT_RANGE);
       
       server = createServer(DAGClientAMProtocolBlockingPB.class, addr, conf, 
                             numHandlers, blockingService, portRange);

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/c6eb9032/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
index 17f4614..bc14f90 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
@@ -594,16 +594,16 @@ public class DAGAppMaster extends CompositeService {
   protected TaskHeartbeatHandler createTaskHeartbeatHandler(AppContext context,
       TezConfiguration conf) {
     TaskHeartbeatHandler thh = new TaskHeartbeatHandler(context, conf.getInt(
-        TezConfiguration.DAG_AM_TASK_LISTENER_THREAD_COUNT,
-        TezConfiguration.DAG_AM_TASK_LISTENER_THREAD_COUNT_DEFAULT));
+        TezConfiguration.TEZ_AM_TASK_LISTENER_THREAD_COUNT,
+        TezConfiguration.TEZ_AM_TASK_LISTENER_THREAD_COUNT_DEFAULT));
     return thh;
   }
 
   protected ContainerHeartbeatHandler createContainerHeartbeatHandler(AppContext context,
       TezConfiguration conf) {
     ContainerHeartbeatHandler chh = new ContainerHeartbeatHandler(context, conf.getInt(
-        TezConfiguration.DAG_AM_CONTAINER_LISTENER_THREAD_COUNT,
-        TezConfiguration.DAG_AM_CONTAINER_LISTENER_THREAD_COUNT_DEFAULT));
+        TezConfiguration.TEZ_AM_CONTAINER_LISTENER_THREAD_COUNT,
+        TezConfiguration.TEZ_AM_CONTAINER_LISTENER_THREAD_COUNT_DEFAULT));
     return chh;
   }
 
@@ -997,7 +997,7 @@ public class DAGAppMaster extends CompositeService {
       FileInputStream dagPBBinaryStream = null;
       try {
         dagPBBinaryStream = new FileInputStream(
-            TezConfiguration.DAG_AM_PLAN_PB_BINARY);
+            TezConfiguration.TEZ_AM_PLAN_PB_BINARY);
         dagPlanBuilder.mergeFrom(dagPBBinaryStream);
       } finally {
         if (dagPBBinaryStream != null) {

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/c6eb9032/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java
b/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java
index 6d3b885..9a33ef6 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java
@@ -114,8 +114,8 @@ public class TaskAttemptListenerImpTezDag extends AbstractService implements
           .setPort(0)
           .setInstance(this)
           .setNumHandlers(
-              conf.getInt(TezConfiguration.DAG_AM_TASK_LISTENER_THREAD_COUNT,
-                  TezConfiguration.DAG_AM_TASK_LISTENER_THREAD_COUNT_DEFAULT))
+              conf.getInt(TezConfiguration.TEZ_AM_TASK_LISTENER_THREAD_COUNT,
+                  TezConfiguration.TEZ_AM_TASK_LISTENER_THREAD_COUNT_DEFAULT))
           .setSecretManager(jobTokenSecretManager).build();
 
       // Enable service authorization?

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/c6eb9032/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
index 9c33523..ed094ed 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
@@ -867,8 +867,8 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
             dag.appContext.getTaskScheduler(),
             dag.conf
                 .getFloat(
-        TezConfiguration.SLOWSTART_DAG_SCHEDULER_MIN_SHUFFLE_RESOURCE_FRACTION,
-        TezConfiguration.SLOWSTART_DAG_SCHEDULER_MIN_SHUFFLE_RESOURCE_FRACTION_DEFAULT));
+        TezConfiguration.SLOWSTART_TEZ_SCHEDULER_MIN_SHUFFLE_RESOURCE_FRACTION,
+        TezConfiguration.SLOWSTART_TEZ_SCHEDULER_MIN_SHUFFLE_RESOURCE_FRACTION_DEFAULT));
       } else {
         LOG.info("Using Natural order dag scheduler");
         dag.dagScheduler = new DAGSchedulerNaturalOrder(dag, dag.eventHandler);

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/c6eb9032/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
index e475bc1..2d81451 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
@@ -289,8 +289,8 @@ public class TaskImpl implements Task, EventHandler<TaskEvent> {
     writeLock = readWriteLock.writeLock();
     this.attempts = Collections.emptyMap();
     // TODO TEZ-47 get from conf or API
-    maxAttempts = this.conf.getInt(TezConfiguration.DAG_MAX_TASK_ATTEMPTS,
-                              TezConfiguration.DAG_MAX_TASK_ATTEMPTS_DEFAULT);
+    maxAttempts = this.conf.getInt(TezConfiguration.TEZ_MAX_TASK_ATTEMPTS,
+                              TezConfiguration.TEZ_MAX_TASK_ATTEMPTS_DEFAULT);
     taskId = new TezTaskID(vertexId, partition);
     this.partition = partition;
     this.taskAttemptListener = taskAttemptListener;

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/c6eb9032/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 2cf649b..a88c01c 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
@@ -106,18 +106,18 @@ public class AMContainerHelpers {
     try {
       // Make dagPlan a local resource for all tasks.
       
-      if (conf.get(TezConfiguration.DAG_AM_PLAN_REMOTE_PATH) != null) {
+      if (conf.get(TezConfiguration.TEZ_AM_PLAN_REMOTE_PATH) != null) {
         Path remotePath = new Path(
-            conf.get(TezConfiguration.DAG_AM_PLAN_REMOTE_PATH));
+            conf.get(TezConfiguration.TEZ_AM_PLAN_REMOTE_PATH));
         LOG.info("Localizing dag-plan via : " + remotePath);
         FileSystem remoteFS = FileSystem.get(conf);
         LocalResource dagPlanLocalResource = createLocalResource(remoteFS,
             remotePath, LocalResourceType.FILE,
             LocalResourceVisibility.APPLICATION);
-        localResources.put(TezConfiguration.DAG_AM_PLAN_PB_BINARY, dagPlanLocalResource);
+        localResources.put(TezConfiguration.TEZ_AM_PLAN_PB_BINARY, dagPlanLocalResource);
       } else {
         LOG.warn("Not localizing dag plan  for tasks since "
-            + TezConfiguration.DAG_AM_PLAN_REMOTE_PATH + " is not set");
+            + TezConfiguration.TEZ_AM_PLAN_REMOTE_PATH + " is not set");
       }
 
       // Setup up task credentials buffer

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/c6eb9032/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeMap.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeMap.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeMap.java
index 9a2e0e9..7e6c435 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeMap.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeMap.java
@@ -67,14 +67,14 @@ public class AMNodeMap extends AbstractService implements
   @Override
   public synchronized void serviceInit(Configuration conf) {
     this.maxTaskFailuresPerNode = conf.getInt(
-        TezConfiguration.DAG_MAX_TASK_FAILURES_PER_NODE, 
-        TezConfiguration.DAG_MAX_TASK_FAILURES_PER_NODE_DEFAULT);
+        TezConfiguration.TEZ_MAX_TASK_FAILURES_PER_NODE, 
+        TezConfiguration.TEZ_MAX_TASK_FAILURES_PER_NODE_DEFAULT);
     this.nodeBlacklistingEnabled = conf.getBoolean(
-        TezConfiguration.DAG_NODE_BLACKLISTING_ENABLED,
-        TezConfiguration.DAG_NODE_BLACKLISTING_ENABLED_DEFAULT);
+        TezConfiguration.TEZ_NODE_BLACKLISTING_ENABLED,
+        TezConfiguration.TEZ_NODE_BLACKLISTING_ENABLED_DEFAULT);
     this.blacklistDisablePercent = conf.getInt(
-          TezConfiguration.DAG_NODE_BLACKLISTING_IGNORE_THRESHOLD,
-          TezConfiguration.DAG_NODE_BLACKLISTING_IGNORE_THRESHOLD_DEFAULT);
+          TezConfiguration.TEZ_NODE_BLACKLISTING_IGNORE_THRESHOLD,
+          TezConfiguration.TEZ_NODE_BLACKLISTING_IGNORE_THRESHOLD_DEFAULT);
 
     LOG.info("blacklistDisablePercent is " + blacklistDisablePercent +
         ", blacklistingEnabled: " + nodeBlacklistingEnabled + 

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/c6eb9032/tez-dag/src/main/java/org/apache/tez/dag/utils/DAGApps.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/utils/DAGApps.java b/tez-dag/src/main/java/org/apache/tez/dag/utils/DAGApps.java
index 0374e9a..0f8acc1 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/utils/DAGApps.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/utils/DAGApps.java
@@ -25,8 +25,8 @@ public class DAGApps {
 
   private static final String STAGING_CONSTANT = ".staging";
   public static Path getStagingAreaDir(TezConfiguration conf, String user) {
-    return new Path(conf.get(TezConfiguration.DAG_AM_STAGING_DIR,
-        TezConfiguration.DAG_AM_STAGING_DIR_DEFAULT)
+    return new Path(conf.get(TezConfiguration.TEZ_AM_STAGING_DIR,
+        TezConfiguration.TEZ_AM_STAGING_DIR_DEFAULT)
         + Path.SEPARATOR + user + Path.SEPARATOR + STAGING_CONSTANT);
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/c6eb9032/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/DeprecatedKeys.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/DeprecatedKeys.java
b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/DeprecatedKeys.java
index d68a01c..b552135 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/DeprecatedKeys.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/DeprecatedKeys.java
@@ -113,15 +113,15 @@ public class DeprecatedKeys {
 
     // TODO Default value handling.
     mrParamToDAGParamMap.put(MRJobConfig.MR_AM_TASK_LISTENER_THREAD_COUNT,
-        TezConfiguration.DAG_AM_TASK_LISTENER_THREAD_COUNT);
+        TezConfiguration.TEZ_AM_TASK_LISTENER_THREAD_COUNT);
     
     mrParamToDAGParamMap.put(MRJobConfig.MAX_TASK_FAILURES_PER_TRACKER,
-        TezConfiguration.DAG_MAX_TASK_FAILURES_PER_NODE);
+        TezConfiguration.TEZ_MAX_TASK_FAILURES_PER_NODE);
     mrParamToDAGParamMap.put(MRJobConfig.MR_AM_JOB_NODE_BLACKLISTING_ENABLE,
-        TezConfiguration.DAG_NODE_BLACKLISTING_ENABLED);
+        TezConfiguration.TEZ_NODE_BLACKLISTING_ENABLED);
     mrParamToDAGParamMap.put(
         MRJobConfig.MR_AM_IGNORE_BLACKLISTING_BLACKLISTED_NODE_PERECENT,
-        TezConfiguration.DAG_NODE_BLACKLISTING_IGNORE_THRESHOLD);
+        TezConfiguration.TEZ_NODE_BLACKLISTING_IGNORE_THRESHOLD);
   }
 
   // TODO TEZAM4 Sometime, make sure this gets loaded by default. Insteaf of the current
initialization in MRAppMaster, TezChild.


Mime
View raw message