tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ss...@apache.org
Subject [2/2] git commit: TEZ-1213. Fix parameter naming in TezJobConfig. (sseth)
Date Fri, 20 Jun 2014 23:23:29 GMT
TEZ-1213. Fix parameter naming in TezJobConfig. (sseth)


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

Branch: refs/heads/master
Commit: afe0c2dadef13e99446f5075d7105dce65359926
Parents: b63bf81
Author: Siddharth Seth <sseth@apache.org>
Authored: Fri Jun 20 16:23:05 2014 -0700
Committer: Siddharth Seth <sseth@apache.org>
Committed: Fri Jun 20 16:23:05 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +
 .../org/apache/tez/common/TezJobConfig.java     | 505 +++++++++----------
 .../org/apache/tez/common/counters/Limits.java  |  16 +-
 .../org/apache/tez/common/TestTezJobConfig.java |  54 ++
 .../apache/tez/runtime/task/TezTaskRunner.java  |   5 +-
 .../mapreduce/split/SplitMetaInfoReaderTez.java |   4 +-
 .../apache/tez/common/MRFrameworkConfigs.java   |  38 ++
 .../tez/mapreduce/hadoop/DeprecatedKeys.java    |  14 +-
 .../tez/mapreduce/partition/MRPartitioner.java  |   4 +-
 .../apache/tez/mapreduce/processor/MRTask.java  |  15 +-
 .../mapreduce/hadoop/TestDeprecatedKeys.java    |   4 +-
 .../tez/mapreduce/processor/MapUtils.java       |  26 +-
 .../processor/map/TestMapProcessor.java         |   6 +-
 .../processor/reduce/TestReduceProcessor.java   |  10 +-
 .../runtime/LogicalIOProcessorRuntimeTask.java  |  10 +-
 .../runtime/api/impl/TezInputContextImpl.java   |   4 +-
 .../runtime/api/impl/TezOutputContextImpl.java  |   4 +-
 .../api/impl/TezProcessorContextImpl.java       |   4 +-
 .../runtime/api/impl/TezTaskContextImpl.java    |   5 +-
 .../common/resources/MemoryDistributor.java     |   8 +-
 .../common/resources/ScalingAllocator.java      |   2 +-
 .../tez/runtime/metrics/TaskCounterUpdater.java |   2 +-
 .../TestLogicalIOProcessorRuntimeTask.java      |   4 +-
 .../common/resources/TestMemoryDistributor.java |   8 +-
 .../tez/common/TezRuntimeFrameworkConfigs.java  |  44 ++
 .../tez/runtime/library/common/Constants.java   |   4 +-
 .../common/localshuffle/LocalShuffle.java       |   2 +-
 .../common/shuffle/impl/MergeManager.java       |  24 +-
 .../library/common/shuffle/impl/Shuffle.java    |   7 +-
 .../shuffle/impl/ShuffleClientMetrics.java      |   7 +-
 .../common/shuffle/impl/ShuffleScheduler.java   |   8 +-
 .../common/sort/impl/ExternalSorter.java        |   5 +-
 .../common/sort/impl/PipelinedSorter.java       |  10 +-
 .../library/common/sort/impl/TezMerger.java     |   9 +-
 .../common/sort/impl/dflt/DefaultSorter.java    |   8 +-
 .../local/output/TezLocalTaskOutputFiles.java   |   6 +-
 .../task/local/output/TezTaskOutputFiles.java   |   4 +-
 .../library/input/ShuffledMergedInput.java      |   3 +-
 .../library/input/ShuffledUnorderedKVInput.java |   3 +-
 .../library/output/OnFileSortedOutput.java      |   5 +-
 .../library/output/OnFileUnorderedKVOutput.java |   3 +-
 .../OnFileUnorderedPartitionedKVOutput.java     |   6 +-
 .../WeightedScalingMemoryDistributor.java       |   8 +-
 .../library/shuffle/common/ShuffleUtils.java    |  13 +-
 .../shuffle/common/impl/ShuffleManager.java     |   2 +-
 .../impl/SimpleFetchedInputAllocator.java       |   9 +-
 .../TestWeightedScalingMemoryDistributor.java   |  18 +-
 .../TestUnorderedPartitionedKVWriter.java       |   3 +-
 .../output/TestOnFileUnorderedKVOutput.java     |   5 +-
 .../impl/TestSimpleFetchedInputAllocator.java   |   4 +-
 50 files changed, 554 insertions(+), 420 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5fe251e..2086dca 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,8 @@ Apache Tez Change Log
 Release 0.5.0-incubating: Unreleased
 
 INCOMPATIBLE CHANGES
+  TEZ-1213. Fix parameter naming in TezJobConfig.
+    - Details at https://issues.apache.org/jira/browse/TEZ-1213?focusedCommentId=14039381&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-14039381
   TEZ-960. VertexManagerPluginContext::getTotalAVailableResource() changed to
   VertexManagerPluginContext::getTotalAvailableResource()
   TEZ-1025. Rename tez.am.max.task.attempts to tez.am.task.max.failed.attempts 

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-api/src/main/java/org/apache/tez/common/TezJobConfig.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/common/TezJobConfig.java b/tez-api/src/main/java/org/apache/tez/common/TezJobConfig.java
index 8a61c39..ea027e7 100644
--- a/tez-api/src/main/java/org/apache/tez/common/TezJobConfig.java
+++ b/tez-api/src/main/java/org/apache/tez/common/TezJobConfig.java
@@ -17,414 +17,393 @@
  */
 package org.apache.tez.common;
 
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
-import org.apache.tez.dag.api.TezConfiguration;
-
 
 /**
  * Meant for user configurable job properties.
+ *
+ * Note for developers: Wheenver adding a new key to this file, it must also be added to the set of
+ * known keys.
  */
 
 // TODO EVENTUALLY A description for each property.
-@Private
+@InterfaceAudience.Public
 @Evolving
 public class TezJobConfig {
 
-
-  public static final String TEZ_TASK_PREFIX = TezConfiguration.TEZ_TASK_PREFIX;
-
-
-  /** The number of milliseconds between progress reports. */
-  public static final int PROGRESS_INTERVAL = 3000;
-
-  public static final long DEFAULT_COMBINE_RECORDS_BEFORE_PROGRESS = 10000;
+  private static final Set<String> keys = new HashSet<String>();
+  private static final String TEZ_RUNTIME_PREFIX = "tez.runtime.";
 
   /**
    * Configuration key to enable/disable IFile readahead.
    */
-  public static final String TEZ_RUNTIME_IFILE_READAHEAD =
-      "tez.runtime.ifile.readahead";
+  public static final String TEZ_RUNTIME_IFILE_READAHEAD = TEZ_RUNTIME_PREFIX +
+      "ifile.readahead";
   public static final boolean TEZ_RUNTIME_IFILE_READAHEAD_DEFAULT = true;
 
   /**
    * Configuration key to set the IFile readahead length in bytes.
    */
-  public static final String TEZ_RUNTIME_IFILE_READAHEAD_BYTES =
-      "tez.runtime.ifile.readahead.bytes";
+  public static final String TEZ_RUNTIME_IFILE_READAHEAD_BYTES = TEZ_RUNTIME_PREFIX +
+      "ifile.readahead.bytes";
   public static final int TEZ_RUNTIME_IFILE_READAHEAD_BYTES_DEFAULT =
       4 * 1024 * 1024;
 
-  /**
-   * TODO Maybe move this over from IFile into this file. -1 for now means ignore.
-   */
   public static final int TEZ_RUNTIME_IFILE_BUFFER_SIZE_DEFAULT = -1;
-  
-  /**
-   * 
-   */
-  public static final String RECORDS_BEFORE_PROGRESS = 
-      "tez.task.merge.progress.records";
-  public static final long DEFAULT_RECORDS_BEFORE_PROGRESS = 10000; 
 
   /**
-   * List of directories avialble to the Runtime. 
+   * This is copy of io.file.buffer.size from Hadoop, which is used in several places such
+   * as compression codecs, buffer sizes in IFile, while fetching etc.
+   * Variable exists so that it can be referenced, instead of using the string name directly.
    */
-  @Private
-  public static final String LOCAL_DIRS = "tez.runtime.local.dirs";
-  public static final String DEFAULT_LOCAL_DIRS = "/tmp";
+  public static final String TEZ_RUNTIME_IO_FILE_BUFFER_SIZE = "io.file.buffer.size";
 
-  /**
-   * One local dir for the speicfic job.
-   */
-  public static final String JOB_LOCAL_DIR = "tez.runtime.job.local.dir";
-  
-  /**
-   * The directory which contains the localized files for this task.
-   */
-  @Private
-  public static final String TASK_LOCAL_RESOURCE_DIR = "tez.runtime.task-local-resource.dir";
-  public static final String DEFAULT_TASK_LOCAL_RESOURCE_DIR = "/tmp";
-  
-  public static final String TEZ_TASK_WORKING_DIR = "tez.runtime.task.working.dir";
 
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_IO_SORT_FACTOR = 
-      "tez.runtime.io.sort.factor";
-  public static final int DEFAULT_TEZ_RUNTIME_IO_SORT_FACTOR = 100;
+  public static final String TEZ_RUNTIME_IO_SORT_FACTOR = TEZ_RUNTIME_PREFIX +
+      "io.sort.factor";
+  public static final int TEZ_RUNTIME_IO_SORT_FACTOR_DEFAULT = 100;
 
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_SORT_SPILL_PERCENT = 
-      "tez.runtime.sort.spill.percent";
-  public static float DEFAULT_TEZ_RUNTIME_SORT_SPILL_PERCENT = 0.8f; 
 
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_IO_SORT_MB = "tez.runtime.io.sort.mb";
-  public static final int DEFAULT_TEZ_RUNTIME_IO_SORT_MB = 100;
+  public static final String TEZ_RUNTIME_SORT_SPILL_PERCENT = TEZ_RUNTIME_PREFIX +
+      "sort.spill.percent";
+  public static float TEZ_RUNTIME_SORT_SPILL_PERCENT_DEFAULT = 0.8f;
 
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_INDEX_CACHE_MEMORY_LIMIT_BYTES = 
-      "tez.runtime.index.cache.memory.limit.bytes";
-  public static final int DEFAULT_TEZ_RUNTIME_INDEX_CACHE_MEMORY_LIMIT_BYTES = 
+
+  public static final String TEZ_RUNTIME_IO_SORT_MB = TEZ_RUNTIME_PREFIX + "io.sort.mb";
+  public static final int TEZ_RUNTIME_IO_SORT_MB_DEFAULT = 100;
+
+
+  public static final String TEZ_RUNTIME_INDEX_CACHE_MEMORY_LIMIT_BYTES = TEZ_RUNTIME_PREFIX +
+      "index.cache.memory.limit.bytes";
+  public static final int TEZ_RUNTIME_INDEX_CACHE_MEMORY_LIMIT_BYTES_DEFAULT =
       1024 * 1024;
 
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_COMBINE_MIN_SPILLS = 
-      "tez.runtime.combine.min.spills";
-  public static final int  DEFAULT_TEZ_RUNTIME_COMBINE_MIN_SPILLS = 3;
+
+  // TODO Use the default value
+  public static final String TEZ_RUNTIME_COMBINE_MIN_SPILLS = TEZ_RUNTIME_PREFIX +
+      "combine.min.spills";
+  public static final int TEZ_RUNTIME_COMBINE_MIN_SPILLS_DEFAULT = 3;
   
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_SORT_THREADS = 
-	      "tez.runtime.sort.threads";
-  public static final int DEFAULT_TEZ_RUNTIME_SORT_THREADS = 1;
+
+  public static final String TEZ_RUNTIME_SORT_THREADS = TEZ_RUNTIME_PREFIX +
+	      "sort.threads";
+  public static final int TEZ_RUNTIME_SORT_THREADS_DEFAULT = 1;
 
   /**
    * Size of the buffer to use if not writing directly to disk.
    */
-  public static final String TEZ_RUNTIME_UNORDERED_OUTPUT_BUFFER_SIZE_MB = 
-      "tez.runtime.unordered.output.buffer.size-mb";
+  public static final String TEZ_RUNTIME_UNORDERED_OUTPUT_BUFFER_SIZE_MB = TEZ_RUNTIME_PREFIX +
+      "unordered.output.buffer.size-mb";
   public static final int TEZ_RUNTIME_UNORDERED_OUTPUT_BUFFER_SIZE_MB_DEFAULT = 100;
   
   /**
    * Maximum size for individual buffers used in the UnsortedPartitionedOutput.
-   * This is only meant to be used by unit tests.
+   * This is only meant to be used by unit tests for now.
    */
   @Private
-  public static final String TEZ_RUNTIME_UNORDERED_OUTPUT_MAX_PER_BUFFER_SIZE_BYTES =
-      "tez.runtime.unordered.output.max-per-buffer.size-bytes";
+  public static final String TEZ_RUNTIME_UNORDERED_OUTPUT_MAX_PER_BUFFER_SIZE_BYTES = TEZ_RUNTIME_PREFIX +
+      "unordered.output.max-per-buffer.size-bytes";
   
   /**
    * Specifies a partitioner class, which is used in Tez Runtime components
    * like OnFileSortedOutput
    */
-  public static final String TEZ_RUNTIME_PARTITIONER_CLASS = "tez.runtime.partitioner.class";
+  public static final String TEZ_RUNTIME_PARTITIONER_CLASS = TEZ_RUNTIME_PREFIX + "partitioner.class";
   
   /**
    * Specifies a combiner class (primarily for Shuffle)
    */
-  public static final String TEZ_RUNTIME_COMBINER_CLASS = "tez.runtime.combiner.class";
-  
-  public static final String TEZ_RUNTIME_NUM_EXPECTED_PARTITIONS = "tez.runtime.num.expected.partitions";
-  
-  /**
-   * 
-   */
-  public static final String COUNTERS_MAX_KEY = "tez.runtime.job.counters.max";
-  public static final int COUNTERS_MAX_DEFAULT = 1200;
+  public static final String TEZ_RUNTIME_COMBINER_CLASS = TEZ_RUNTIME_PREFIX + "combiner.class";
 
-  /**
-   * 
-   */
-  public static final String COUNTER_GROUP_NAME_MAX_KEY = "tez.runtime.job.counters.group.name.max";
-  public static final int COUNTER_GROUP_NAME_MAX_DEFAULT = 128;
+  public static final String TEZ_RUNTIME_COUNTERS_MAX_KEY = TEZ_RUNTIME_PREFIX + "job.counters.max";
+  public static final int TEZ_RUNTIME_COUNTERS_MAX_DEFAULT = 1200;
 
-  /**
-   * 
-   */
-  public static final String COUNTER_NAME_MAX_KEY = "tez.runtime.job.counters.counter.name.max";
-  public static final int COUNTER_NAME_MAX_DEFAULT = 64;
 
-  /**
-   * 
-   */
-  public static final String COUNTER_GROUPS_MAX_KEY = "tez.runtime.job.counters.groups.max";
-  public static final int COUNTER_GROUPS_MAX_DEFAULT = 500;
+  public static final String TEZ_RUNTIME_COUNTER_GROUP_NAME_MAX_KEY = TEZ_RUNTIME_PREFIX + "job.counters.group.name.max";
+  public static final int TEZ_RUNTIME_COUNTER_GROUP_NAME_MAX_DEFAULT = 128;
 
-  
-  /**
-   * Temporary interface for MR only (not chained Tez) to indicate whether
-   * in-memory shuffle should be used.
-   */
-  @Private
-  public static final String TEZ_RUNTIME_SHUFFLE_USE_IN_MEMORY =
-      "tez.runtime.shuffle.use.in-memory";
-  public static final boolean DEFAULT_TEZ_RUNTIME_SHUFFLE_USE_IN_MEMORY = false;
 
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_SHUFFLE_PARALLEL_COPIES = 
-      "tez.runtime.shuffle.parallel.copies";
-  public static final int DEFAULT_TEZ_RUNTIME_SHUFFLE_PARALLEL_COPIES = 20;
+  public static final String TEZ_RUNTIME_COUNTER_NAME_MAX_KEY = TEZ_RUNTIME_PREFIX + "job.counters.counter.name.max";
+  public static final int TEZ_RUNTIME_COUNTER_NAME_MAX_DEFAULT = 64;
 
-  /**
-   * TODO Is this user configurable.
-   */
-  public static final String TEZ_RUNTIME_METRICS_SESSION_ID = 
-      "tez.runtime.metrics.session.id";
-  public static final String DEFAULT_TEZ_RUNTIME_METRICS_SESSION_ID = "";
 
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_SHUFFLE_FETCH_FAILURES = 
-      "tez.runtime.shuffle.fetch.failures.limit";
-  public final static int DEFAULT_TEZ_RUNTIME_SHUFFLE_FETCH_FAILURES_LIMIT = 5;
+  public static final String TEZ_RUNTIME_COUNTER_GROUPS_MAX_KEY = TEZ_RUNTIME_PREFIX + "job.counters.groups.max";
+  public static final int TEZ_RUNTIME_COUNTER_GROUPS_MAX_DEFAULT = 500;
 
 
-  /**
-   *
-   */
-  public static final String TEZ_RUNTIME_SHUFFLE_FETCH_MAX_TASK_OUTPUT_AT_ONCE =
-    "tez.runtime.shuffle.fetch.max.task.output.at.once";
-  public final static int DEFAULT_TEZ_RUNTIME_SHUFFLE_FETCH_MAX_TASK_OUTPUT_AT_ONCE
+  public static final String TEZ_RUNTIME_SHUFFLE_PARALLEL_COPIES = TEZ_RUNTIME_PREFIX +
+      "shuffle.parallel.copies";
+  public static final int TEZ_RUNTIME_SHUFFLE_PARALLEL_COPIES_DEFAULT = 20;
+
+
+  public static final String TEZ_RUNTIME_SHUFFLE_FETCH_FAILURES_LIMIT = TEZ_RUNTIME_PREFIX +
+      "shuffle.fetch.failures.limit";
+  public static final int TEZ_RUNTIME_SHUFFLE_FETCH_FAILURES_LIMIT_DEFAULT = 5;
+
+
+  public static final String TEZ_RUNTIME_SHUFFLE_FETCH_MAX_TASK_OUTPUT_AT_ONCE = TEZ_RUNTIME_PREFIX +
+    "shuffle.fetch.max.task.output.at.once";
+  public final static int TEZ_RUNTIME_SHUFFLE_FETCH_MAX_TASK_OUTPUT_AT_ONCE_DEFAULT
           = 20;
 
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_SHUFFLE_NOTIFY_READERROR = 
-      "tez.runtime.shuffle.notify.readerror";
-  public static final boolean DEFAULT_TEZ_RUNTIME_SHUFFLE_NOTIFY_READERROR = true;
 
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_SHUFFLE_CONNECT_TIMEOUT = 
-      "tez.runtime.shuffle.connect.timeout";
-  public static final int DEFAULT_TEZ_RUNTIME_SHUFFLE_STALLED_COPY_TIMEOUT = 
+  public static final String TEZ_RUNTIME_SHUFFLE_NOTIFY_READERROR = TEZ_RUNTIME_PREFIX +
+      "shuffle.notify.readerror";
+  public static final boolean TEZ_RUNTIME_SHUFFLE_NOTIFY_READERROR_DEFAULT = true;
+
+
+  public static final String TEZ_RUNTIME_SHUFFLE_CONNECT_TIMEOUT = TEZ_RUNTIME_PREFIX +
+      "shuffle.connect.timeout";
+  public static final int TEZ_RUNTIME_SHUFFLE_STALLED_COPY_TIMEOUT_DEFAULT =
       3 * 60 * 1000;
 
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_SHUFFLE_KEEP_ALIVE_ENABLED =
-      "tez.runtime.shuffle.keep-alive.enabled";
-  public static final boolean DEFAULT_TEZ_RUNTIME_SHUFFLE_KEEP_ALIVE_ENABLED = false;
 
-  /**
-   *
-   */
-  public static final String TEZ_RUNTIME_SHUFFLE_KEEP_ALIVE_MAX_CONNECTIONS =
-      "tez.runtime.shuffle.keep-alive.max.connections";
-  public static final int DEFAULT_TEZ_RUNTIME_SHUFFLE_KEEP_ALIVE_MAX_CONNECTIONS = 20;
+  public static final String TEZ_RUNTIME_SHUFFLE_KEEP_ALIVE_ENABLED = TEZ_RUNTIME_PREFIX +
+      "shuffle.keep-alive.enabled";
+  public static final boolean TEZ_RUNTIME_SHUFFLE_KEEP_ALIVE_ENABLED_DEFAULT = false;
 
-  /**
-   *
-   */
-  public static final String TEZ_RUNTIME_SHUFFLE_READ_TIMEOUT = "tez.runtime.shuffle.read.timeout";
-  public final static int DEFAULT_TEZ_RUNTIME_SHUFFLE_READ_TIMEOUT = 
+
+  public static final String TEZ_RUNTIME_SHUFFLE_KEEP_ALIVE_MAX_CONNECTIONS = TEZ_RUNTIME_PREFIX +
+      "shuffle.keep-alive.max.connections";
+  public static final int TEZ_RUNTIME_SHUFFLE_KEEP_ALIVE_MAX_CONNECTIONS_DEFAULT = 20;
+
+
+  public static final String TEZ_RUNTIME_SHUFFLE_READ_TIMEOUT = TEZ_RUNTIME_PREFIX + "shuffle.read.timeout";
+  public final static int TEZ_RUNTIME_SHUFFLE_READ_TIMEOUT_DEFAULT =
       3 * 60 * 1000;
 
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_SHUFFLE_BUFFER_SIZE = "tez.runtime.shuffle.buffersize";
-  public final static int DEFAULT_TEZ_RUNTIME_SHUFFLE_BUFFER_SIZE = 
+
+  public static final String TEZ_RUNTIME_SHUFFLE_BUFFER_SIZE = TEZ_RUNTIME_PREFIX + "shuffle.buffersize";
+  public final static int TEZ_RUNTIME_SHUFFLE_BUFFER_SIZE_DEFAULT =
       8 * 1024;
 
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_SHUFFLE_ENABLE_SSL = 
-      "tez.runtime.shuffle.ssl.enable";
-  public static final boolean DEFAULT_TEZ_RUNTIME_SHUFFLE_ENABLE_SSL = false;
 
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_SHUFFLE_INPUT_BUFFER_PERCENT = 
-      "tez.runtime.shuffle.input.buffer.percent";
-  public static final float DEFAULT_TEZ_RUNTIME_SHUFFLE_INPUT_BUFFER_PERCENT =
+  public static final String TEZ_RUNTIME_SHUFFLE_ENABLE_SSL = TEZ_RUNTIME_PREFIX +
+      "shuffle.ssl.enable";
+  public static final boolean TEZ_RUNTIME_SHUFFLE_ENABLE_SSL_DEFAULT = false;
+
+
+  public static final String TEZ_RUNTIME_SHUFFLE_INPUT_BUFFER_PERCENT = TEZ_RUNTIME_PREFIX +
+      "shuffle.input.buffer.percent";
+  public static final float TEZ_RUNTIME_SHUFFLE_INPUT_BUFFER_PERCENT_DEFAULT =
       0.90f;
 
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_SHUFFLE_MEMORY_LIMIT_PERCENT = 
-      "tez.runtime.shuffle.memory.limit.percent";
-  public static final float DEFAULT_TEZ_RUNTIME_SHUFFLE_MEMORY_LIMIT_PERCENT = 
+
+  public static final String TEZ_RUNTIME_SHUFFLE_MEMORY_LIMIT_PERCENT = TEZ_RUNTIME_PREFIX +
+      "shuffle.memory.limit.percent";
+  public static final float TEZ_RUNTIME_SHUFFLE_MEMORY_LIMIT_PERCENT_DEFAULT =
       0.25f;
 
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_SHUFFLE_MERGE_PERCENT = 
-      "tez.runtime.shuffle.merge.percent";
-  public static final float DEFAULT_TEZ_RUNTIME_SHUFFLE_MERGE_PERCENT = 0.90f;
+  // Rename to fraction
+  public static final String TEZ_RUNTIME_SHUFFLE_MERGE_PERCENT = TEZ_RUNTIME_PREFIX +
+      "shuffle.merge.percent";
+  public static final float TEZ_RUNTIME_SHUFFLE_MERGE_PERCENT_DEFAULT = 0.90f;
 
   /**
    * TODO TEZAM3 default value ?
    */
-  public static final String TEZ_RUNTIME_SHUFFLE_MEMTOMEM_SEGMENTS = 
-      "tez.runtime.shuffle.memory-to-memory.segments";
+  public static final String TEZ_RUNTIME_SHUFFLE_MEMTOMEM_SEGMENTS = TEZ_RUNTIME_PREFIX +
+      "shuffle.memory-to-memory.segments";
 
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_SHUFFLE_ENABLE_MEMTOMEM = 
-      "tez.runtime.shuffle.memory-to-memory.enable";
-  public static final boolean DEFAULT_TEZ_RUNTIME_SHUFFLE_ENABLE_MEMTOMEM = 
+
+  public static final String TEZ_RUNTIME_SHUFFLE_ENABLE_MEMTOMEM = TEZ_RUNTIME_PREFIX +
+      "shuffle.memory-to-memory.enable";
+  public static final boolean TEZ_RUNTIME_SHUFFLE_ENABLE_MEMTOMEM_DEFAULT =
       false;
 
-  /**
-   * 
-   */
-  public static final String TEZ_RUNTIME_INPUT_BUFFER_PERCENT = 
-      "tez.runtime.task.input.buffer.percent";
-  public static final float DEFAULT_TEZ_RUNTIME_INPUT_BUFFER_PERCENT = 0.0f;
 
-  // TODO Rename. 
-  public static final String TEZ_RUNTIME_GROUP_COMPARATOR_CLASS = 
-      "tez.runtime.group.comparator.class";
-  
-  // TODO Better name.
-  public static final String TEZ_RUNTIME_INTERNAL_SORTER_CLASS = 
-      "tez.runtime.internal.sorter.class";
+  // TODO Maybe rename to reflect what this actually does
+  public static final String TEZ_RUNTIME_INPUT_BUFFER_PERCENT = TEZ_RUNTIME_PREFIX +
+      "task.input.buffer.percent";
+  public static final float TEZ_RUNTIME_INPUT_BUFFER_PERCENT_DEFAULT = 0.0f;
+
+
+  public static final String TEZ_RUNTIME_GROUP_COMPARATOR_CLASS = TEZ_RUNTIME_PREFIX +
+      "group.comparator.class";
+
+  public static final String TEZ_RUNTIME_INTERNAL_SORTER_CLASS = TEZ_RUNTIME_PREFIX +
+      "internal.sorter.class";
   
-  public static final String TEZ_RUNTIME_INTERMEDIATE_OUTPUT_KEY_COMPARATOR_CLASS = 
-      "tez.runtime.intermediate-output.key.comparator.class";
-  public static final String TEZ_RUNTIME_INTERMEDIATE_INPUT_KEY_COMPARATOR_CLASS = 
-      "tez.runtime.intermediate-input.key.comparator.class";
-
-  public static final String TEZ_RUNTIME_INTERMEDIATE_OUTPUT_KEY_CLASS = 
-      "tez.runtime.intermediate-output.key.class";
-  public static final String TEZ_RUNTIME_INTERMEDIATE_INPUT_KEY_CLASS = 
-      "tez.runtime.intermediate-input.key.class";
+  public static final String TEZ_RUNTIME_INTERMEDIATE_OUTPUT_KEY_COMPARATOR_CLASS = TEZ_RUNTIME_PREFIX +
+      "intermediate-output.key.comparator.class";
+  public static final String TEZ_RUNTIME_INTERMEDIATE_INPUT_KEY_COMPARATOR_CLASS = TEZ_RUNTIME_PREFIX +
+      "intermediate-input.key.comparator.class";
+
+  public static final String TEZ_RUNTIME_INTERMEDIATE_OUTPUT_KEY_CLASS = TEZ_RUNTIME_PREFIX +
+      "intermediate-output.key.class";
+  public static final String TEZ_RUNTIME_INTERMEDIATE_INPUT_KEY_CLASS = TEZ_RUNTIME_PREFIX +
+      "intermediate-input.key.class";
   
-  public static final String TEZ_RUNTIME_INTERMEDIATE_OUTPUT_VALUE_CLASS = 
-      "tez.runtime.intermediate-output.value.class";
-  public static final String TEZ_RUNTIME_INTERMEDIATE_INPUT_VALUE_CLASS = 
-      "tez.runtime.intermediate-input.value.class";
+  public static final String TEZ_RUNTIME_INTERMEDIATE_OUTPUT_VALUE_CLASS = TEZ_RUNTIME_PREFIX +
+      "intermediate-output.value.class";
+  public static final String TEZ_RUNTIME_INTERMEDIATE_INPUT_VALUE_CLASS = TEZ_RUNTIME_PREFIX +
+      "intermediate-input.value.class";
 
 
   /** Whether intermediate output should be compressed or not */
-  public static final String TEZ_RUNTIME_INTERMEDIATE_OUTPUT_SHOULD_COMPRESS = 
-      "tez.runtime.intermediate-output.should-compress";
+  public static final String TEZ_RUNTIME_INTERMEDIATE_OUTPUT_SHOULD_COMPRESS = TEZ_RUNTIME_PREFIX +
+      "intermediate-output.should-compress";
   /** Whether intermediate input is compressed */
-  public static final String TEZ_RUNTIME_INTERMEDIATE_INPUT_IS_COMPRESSED = 
-      "tez.runtime.intermediate-input.is-compressed";
+  public static final String TEZ_RUNTIME_INTERMEDIATE_INPUT_IS_COMPRESSED = TEZ_RUNTIME_PREFIX +
+      "intermediate-input.is-compressed";
   /**
    * The coded to be used if compressing intermediate output. Only applicable if
    * tez.runtime.intermediate-output.should-compress is enabled.
    */
-  public static final String TEZ_RUNTIME_INTERMEDIATE_OUTPUT_COMPRESS_CODEC = 
-      "tez.runtime.intermediate-output.compress.codec";
+  public static final String TEZ_RUNTIME_INTERMEDIATE_OUTPUT_COMPRESS_CODEC = TEZ_RUNTIME_PREFIX +
+      "intermediate-output.compress.codec";
   /**
    * The coded to be used when reading intermediate compressed input. Only
    * applicable if tez.runtime.intermediate-input.is-compressed is enabled.
    */
-  public static final String TEZ_RUNTIME_INTERMEDIATE_INPUT_COMPRESS_CODEC = 
-      "tez.runtime.intermediate-input.compress.codec";
+  public static final String TEZ_RUNTIME_INTERMEDIATE_INPUT_COMPRESS_CODEC = TEZ_RUNTIME_PREFIX +
+      "intermediate-input.compress.codec";
 
 
-  public static final String TEZ_RUNTIME_INTERMEDIATE_INPUT_KEY_SECONDARY_COMPARATOR_CLASS = 
-      "tez.runtime.intermediate-input.key.secondary.comparator.class";
+  public static final String TEZ_RUNTIME_INTERMEDIATE_INPUT_KEY_SECONDARY_COMPARATOR_CLASS = TEZ_RUNTIME_PREFIX +
+      "intermediate-input.key.secondary.comparator.class";
 
-  public static final String TEZ_RUNTIME_EMPTY_PARTITION_INFO_VIA_EVENTS_ENABLED =
-      "tez.runtime.empty.partitions.info-via-events.enabled";
+  public static final String TEZ_RUNTIME_EMPTY_PARTITION_INFO_VIA_EVENTS_ENABLED = TEZ_RUNTIME_PREFIX +
+      "empty.partitions.info-via-events.enabled";
   public static final boolean TEZ_RUNTIME_EMPTY_PARTITION_INFO_VIA_EVENTS_ENABLED_DEFAULT = true;
 
-  public static final String TEZ_RUNTIME_BROADCAST_DATA_VIA_EVENTS_ENABLED = "tez.runtime.broadcast.data-via-events.enabled";
+  public static final String TEZ_RUNTIME_BROADCAST_DATA_VIA_EVENTS_ENABLED = TEZ_RUNTIME_PREFIX + "broadcast.data-via-events.enabled";
   public static final boolean TEZ_RUNTIME_BROADCAST_DATA_VIA_EVENTS_ENABLED_DEFAULT = false;
   
-  public static final String TEZ_RUNTIME_BROADCAST_DATA_VIA_EVENTS_MAX_SIZE = "tez.runtime.broadcast.data-via-events.max-size";
+  public static final String TEZ_RUNTIME_BROADCAST_DATA_VIA_EVENTS_MAX_SIZE = TEZ_RUNTIME_PREFIX + "broadcast.data-via-events.max-size";
   public static final int TEZ_RUNTIME_BROADCAST_DATA_VIA_EVENTS_MAX_SIZE_DEFAULT = 200 << 10;// 200KB
   
   /** Defines the ProcessTree implementation which will be used to collect resource utilization. */
-  public static final String TEZ_RESOURCE_CALCULATOR_PROCESS_TREE_CLASS = "tez.resource.calculator.process-tree.class";
+  public static final String TEZ_RUNTIME_RESOURCE_CALCULATOR_PROCESS_TREE_CLASS = TEZ_RUNTIME_PREFIX + "resource.calculator.process-tree.class";
 
   /**
    * Whether to scale down memory requested by each component if the total
    * exceeds the available JVM memory
    */
   @Private @Unstable
-  public static final String TEZ_TASK_SCALE_MEMORY_ENABLED = TEZ_TASK_PREFIX
-      + "scale.memory.enabled";
-  public static final boolean TEZ_TASK_SCALE_MEMORY_ENABLED_DEFAULT = true;
+  public static final String TEZ_RUNTIME_SCALE_TASK_MEMORY_ENABLED = TEZ_RUNTIME_PREFIX
+      + "scale.task.memory.enabled";
+  public static final boolean TEZ_RUNTIME_SCALE_TASK_MEMORY_ENABLED_DEFAULT = true;
   
   /**
    * The allocator to use for initial memory allocation
    */
   @Private @Unstable
-  public static final String TEZ_TASK_SCALE_MEMORY_ALLOCATOR_CLASS = TEZ_TASK_PREFIX
-      + "scale.memory.allocator.class";
-  public static final String TEZ_TASK_SCALE_MEMORY_ALLOCATOR_CLASS_DEFAULT = "org.apache.tez.runtime.common.resources.ScalingAllocator";
+  public static final String TEZ_RUNTIME_SCALE_TASK_MEMORY_ALLOCATOR_CLASS = TEZ_RUNTIME_PREFIX
+      + "scale.task.memory.allocator.class";
+  public static final String TEZ_RUNTIME_SCALE_TASK_MEMORY_ALLOCATOR_CLASS_DEFAULT = "org.apache.tez.runtime.common.resources.ScalingAllocator";
   
   /**
    * The fraction of the JVM memory which will not be considered for allocation.
    * No defaults, since there are pre-existing defaults based on different scenarios.
    */
   @Private @Unstable
-  public static final String TEZ_TASK_SCALE_MEMORY_RESERVE_FRACTION = TEZ_TASK_PREFIX
-      + "scale.memory.reserve-fraction";
+  public static final String TEZ_RUNTIME_SCALE_TASK_MEMORY_RESERVE_FRACTION = TEZ_RUNTIME_PREFIX
+      + "scale.task.memory.reserve-fraction";
 
   /**
    * Fraction of available memory to reserve per input/output. This amount is
    * removed from the total available pool before allocation and is for factoring in overheads.
    */
   @Private @Unstable
-  public static final String TEZ_TASK_SCALE_MEMORY_ADDITIONAL_RESERVATION_FRACTION_PER_IO = TEZ_TASK_PREFIX
-      + "scale.memory.additional.reservation.fraction.per-io";
+  public static final String TEZ_RUNTIME_SCALE_TASK_MEMORY_ADDITIONAL_RESERVATION_FRACTION_PER_IO = TEZ_RUNTIME_PREFIX
+      + "scale.task.memory.additional.reservation.fraction.per-io";
 
   /**
    * Max cumulative total reservation for additional IOs.
    */
-  public static final String TEZ_TASK_SCALE_MEMORY_ADDITIONAL_RESERVATION_FRACTION_MAX = TEZ_TASK_PREFIX
-      + "scale.memory.additional reservation.fraction.max";
+  public static final String TEZ_RUNTIME_SCALE_TASK_MEMORY_ADDITIONAL_RESERVATION_FRACTION_MAX = TEZ_RUNTIME_PREFIX
+      + "scale.task.memory.additional reservation.fraction.max";
   /*
    * Weighted ratios for individual component types in the RuntimeLibrary.
    * e.g. PARTITIONED_UNSORTED_OUTPUT:0,UNSORTED_INPUT:1,SORTED_OUTPUT:2,SORTED_MERGED_INPUT:3,PROCESSOR:1,OTHER:1
    */
   @Private @Unstable
-  public static final String TEZ_TASK_SCALE_MEMORY_WEIGHTED_RATIOS = TEZ_TASK_PREFIX
-      + "initial.memory.scale.ratios";
-  
+  public static final String TEZ_RUNTIME_SCALE_TASK_MEMORY_WEIGHTED_RATIOS = TEZ_RUNTIME_PREFIX
+      + "scale.task.memory.ratios";
+
   /**
-   * Path to a credentials file located on the local file system with serialized credentials
+   * Path to a credentials file located on the local file system with serialized credentials.
+   * Note: This property does not follow the standard convention of including tez.runtime in it's name.
    */
   public static final String TEZ_CREDENTIALS_PATH = "tez.credentials.path";
+
+
+  @Unstable
+  @Private
+  public static final String TEZ_RUNTIME_RECORDS_BEFORE_PROGRESS = TEZ_RUNTIME_PREFIX +
+      "merge.progress.records";
+  public static final long TEZ_RUNTIME_RECORDS_BEFORE_PROGRESS_DEFAULT = 10000;
+
+  static {
+    keys.add(TEZ_RUNTIME_IFILE_READAHEAD);
+    keys.add(TEZ_RUNTIME_IFILE_READAHEAD_BYTES);
+    keys.add(TEZ_RUNTIME_IO_FILE_BUFFER_SIZE);
+    keys.add(TEZ_RUNTIME_IO_SORT_FACTOR);
+    keys.add(TEZ_RUNTIME_SORT_SPILL_PERCENT);
+    keys.add(TEZ_RUNTIME_IO_SORT_MB);
+    keys.add(TEZ_RUNTIME_INDEX_CACHE_MEMORY_LIMIT_BYTES);
+    keys.add(TEZ_RUNTIME_COMBINE_MIN_SPILLS);
+    keys.add(TEZ_RUNTIME_SORT_THREADS);
+    keys.add(TEZ_RUNTIME_UNORDERED_OUTPUT_BUFFER_SIZE_MB);
+    keys.add(TEZ_RUNTIME_UNORDERED_OUTPUT_MAX_PER_BUFFER_SIZE_BYTES);
+    keys.add(TEZ_RUNTIME_PARTITIONER_CLASS);
+    keys.add(TEZ_RUNTIME_COMBINER_CLASS);
+    keys.add(TEZ_RUNTIME_COUNTERS_MAX_KEY);
+    keys.add(TEZ_RUNTIME_COUNTER_GROUP_NAME_MAX_KEY);
+    keys.add(TEZ_RUNTIME_COUNTER_NAME_MAX_KEY);
+    keys.add(TEZ_RUNTIME_COUNTER_GROUPS_MAX_KEY);
+    keys.add(TEZ_RUNTIME_SHUFFLE_PARALLEL_COPIES);
+    keys.add(TEZ_RUNTIME_SHUFFLE_FETCH_FAILURES_LIMIT);
+    keys.add(TEZ_RUNTIME_SHUFFLE_FETCH_MAX_TASK_OUTPUT_AT_ONCE);
+    keys.add(TEZ_RUNTIME_SHUFFLE_NOTIFY_READERROR);
+    keys.add(TEZ_RUNTIME_SHUFFLE_CONNECT_TIMEOUT);
+    keys.add(TEZ_RUNTIME_SHUFFLE_KEEP_ALIVE_ENABLED);
+    keys.add(TEZ_RUNTIME_SHUFFLE_KEEP_ALIVE_MAX_CONNECTIONS);
+    keys.add(TEZ_RUNTIME_SHUFFLE_READ_TIMEOUT);
+    keys.add(TEZ_RUNTIME_SHUFFLE_BUFFER_SIZE);
+    keys.add(TEZ_RUNTIME_SHUFFLE_ENABLE_SSL);
+    keys.add(TEZ_RUNTIME_SHUFFLE_INPUT_BUFFER_PERCENT);
+    keys.add(TEZ_RUNTIME_SHUFFLE_MEMORY_LIMIT_PERCENT);
+    keys.add(TEZ_RUNTIME_SHUFFLE_MERGE_PERCENT);
+    keys.add(TEZ_RUNTIME_SHUFFLE_MEMTOMEM_SEGMENTS);
+    keys.add(TEZ_RUNTIME_SHUFFLE_ENABLE_MEMTOMEM);
+    keys.add(TEZ_RUNTIME_INPUT_BUFFER_PERCENT);
+    keys.add(TEZ_RUNTIME_GROUP_COMPARATOR_CLASS);
+    keys.add(TEZ_RUNTIME_INTERNAL_SORTER_CLASS);
+    keys.add(TEZ_RUNTIME_INTERMEDIATE_OUTPUT_KEY_COMPARATOR_CLASS);
+    keys.add(TEZ_RUNTIME_INTERMEDIATE_INPUT_KEY_COMPARATOR_CLASS);
+    keys.add(TEZ_RUNTIME_INTERMEDIATE_OUTPUT_KEY_CLASS);
+    keys.add(TEZ_RUNTIME_INTERMEDIATE_INPUT_KEY_CLASS);
+    keys.add(TEZ_RUNTIME_INTERMEDIATE_OUTPUT_VALUE_CLASS);
+    keys.add(TEZ_RUNTIME_INTERMEDIATE_INPUT_VALUE_CLASS);
+    keys.add(TEZ_RUNTIME_INTERMEDIATE_OUTPUT_SHOULD_COMPRESS);
+    keys.add(TEZ_RUNTIME_INTERMEDIATE_INPUT_IS_COMPRESSED);
+    keys.add(TEZ_RUNTIME_INTERMEDIATE_OUTPUT_COMPRESS_CODEC);
+    keys.add(TEZ_RUNTIME_INTERMEDIATE_INPUT_COMPRESS_CODEC);
+    keys.add(TEZ_RUNTIME_INTERMEDIATE_INPUT_KEY_SECONDARY_COMPARATOR_CLASS);
+    keys.add(TEZ_RUNTIME_EMPTY_PARTITION_INFO_VIA_EVENTS_ENABLED);
+    keys.add(TEZ_RUNTIME_BROADCAST_DATA_VIA_EVENTS_ENABLED);
+    keys.add(TEZ_RUNTIME_BROADCAST_DATA_VIA_EVENTS_MAX_SIZE);
+    keys.add(TEZ_RUNTIME_RESOURCE_CALCULATOR_PROCESS_TREE_CLASS);
+    keys.add(TEZ_RUNTIME_SCALE_TASK_MEMORY_ENABLED);
+    keys.add(TEZ_RUNTIME_SCALE_TASK_MEMORY_ALLOCATOR_CLASS);
+    keys.add(TEZ_RUNTIME_SCALE_TASK_MEMORY_RESERVE_FRACTION);
+    keys.add(TEZ_RUNTIME_SCALE_TASK_MEMORY_ADDITIONAL_RESERVATION_FRACTION_PER_IO);
+    keys.add(TEZ_RUNTIME_SCALE_TASK_MEMORY_ADDITIONAL_RESERVATION_FRACTION_MAX);
+    keys.add(TEZ_RUNTIME_SCALE_TASK_MEMORY_WEIGHTED_RATIOS);
+    keys.add(TEZ_CREDENTIALS_PATH);
+    keys.add(TEZ_RUNTIME_RECORDS_BEFORE_PROGRESS);
+  }
+
+  public static Set<String> getKeySet() {
+    return Collections.unmodifiableSet(keys);
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-api/src/main/java/org/apache/tez/common/counters/Limits.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/common/counters/Limits.java b/tez-api/src/main/java/org/apache/tez/common/counters/Limits.java
index 070c4c2..54321a8 100644
--- a/tez-api/src/main/java/org/apache/tez/common/counters/Limits.java
+++ b/tez-api/src/main/java/org/apache/tez/common/counters/Limits.java
@@ -44,17 +44,17 @@ public class Limits {
       conf = new Configuration();
     }
     GROUP_NAME_MAX =
-        conf.getInt(TezJobConfig.COUNTER_GROUP_NAME_MAX_KEY,
-            TezJobConfig.COUNTER_GROUP_NAME_MAX_DEFAULT);
+        conf.getInt(TezJobConfig.TEZ_RUNTIME_COUNTER_GROUP_NAME_MAX_KEY,
+            TezJobConfig.TEZ_RUNTIME_COUNTER_GROUP_NAME_MAX_DEFAULT);
     COUNTER_NAME_MAX =
-        conf.getInt(TezJobConfig.COUNTER_NAME_MAX_KEY,
-            TezJobConfig.COUNTER_NAME_MAX_DEFAULT);
+        conf.getInt(TezJobConfig.TEZ_RUNTIME_COUNTER_NAME_MAX_KEY,
+            TezJobConfig.TEZ_RUNTIME_COUNTER_NAME_MAX_DEFAULT);
     GROUPS_MAX =
-        conf.getInt(TezJobConfig.COUNTER_GROUPS_MAX_KEY,
-            TezJobConfig.COUNTER_GROUPS_MAX_DEFAULT);
+        conf.getInt(TezJobConfig.TEZ_RUNTIME_COUNTER_GROUPS_MAX_KEY,
+            TezJobConfig.TEZ_RUNTIME_COUNTER_GROUPS_MAX_DEFAULT);
     COUNTERS_MAX =
-        conf.getInt(TezJobConfig.COUNTERS_MAX_KEY, TezJobConfig.
-            COUNTERS_MAX_DEFAULT);
+        conf.getInt(TezJobConfig.TEZ_RUNTIME_COUNTERS_MAX_KEY, TezJobConfig.
+            TEZ_RUNTIME_COUNTERS_MAX_DEFAULT);
     initialized = true;
     LOG.info("Counter limits initialized with parameters: " + " GROUP_NAME_MAX=" + GROUP_NAME_MAX
         + ", MAX_GROUPS=" + GROUPS_MAX + ", COUNTER_NAME_MAX=" + COUNTER_NAME_MAX

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-api/src/test/java/org/apache/tez/common/TestTezJobConfig.java
----------------------------------------------------------------------
diff --git a/tez-api/src/test/java/org/apache/tez/common/TestTezJobConfig.java b/tez-api/src/test/java/org/apache/tez/common/TestTezJobConfig.java
new file mode 100644
index 0000000..1aae83c
--- /dev/null
+++ b/tez-api/src/test/java/org/apache/tez/common/TestTezJobConfig.java
@@ -0,0 +1,54 @@
+/*
+ * *
+ *  * Licensed to the Apache Software Foundation (ASF) under one
+ *  * or more contributor license agreements.  See the NOTICE file
+ *  * distributed with this work for additional information
+ *  * regarding copyright ownership.  The ASF licenses this file
+ *  * to you under the Apache License, Version 2.0 (the
+ *  * "License"); you may not use this file except in compliance
+ *  * with the License.  You may obtain a copy of the License at
+ *  *
+ *  *     http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package org.apache.tez.common;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.lang.reflect.Field;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Test;
+
+public class TestTezJobConfig {
+
+
+  @Test
+  public void testKeySet() throws IllegalAccessException {
+    Class<?> c = TezJobConfig.class;
+    Set<String> expectedKeys = new HashSet<String>();
+    for (Field f : c.getFields()) {
+      if (!f.getName().endsWith("DEFAULT") && f.getType() == String.class) {
+        expectedKeys.add((String) f.get(null));
+      }
+    }
+
+    Set<String> actualKeySet = TezJobConfig.getKeySet();
+    for (String key : actualKeySet) {
+      if (!expectedKeys.remove(key)) {
+        fail("Found unexpected key: " + key + " in key set");
+      }
+    }
+    assertTrue("Missing keys in key set: " + expectedKeys, expectedKeys.size() == 0);
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-dag/src/main/java/org/apache/tez/runtime/task/TezTaskRunner.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/runtime/task/TezTaskRunner.java b/tez-dag/src/main/java/org/apache/tez/runtime/task/TezTaskRunner.java
index 0e622f9..fb770e6 100644
--- a/tez-dag/src/main/java/org/apache/tez/runtime/task/TezTaskRunner.java
+++ b/tez-dag/src/main/java/org/apache/tez/runtime/task/TezTaskRunner.java
@@ -34,7 +34,7 @@ import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.util.ExitUtil;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.tez.common.TezJobConfig;
+import org.apache.tez.common.TezRuntimeFrameworkConfigs;
 import org.apache.tez.common.TezTaskUmbilicalProtocol;
 import org.apache.tez.dag.api.TezException;
 import org.apache.tez.dag.records.TezTaskAttemptID;
@@ -73,10 +73,9 @@ public class TezTaskRunner implements TezUmbilical, ErrorReporter {
       TaskReporter taskReporter, ListeningExecutorService executor) throws IOException {
     this.tezConf = tezConf;
     this.ugi = ugi;
-    this.tezConf.setStrings(TezJobConfig.LOCAL_DIRS, localDirs);
     this.taskReporter = taskReporter;
     this.executor = executor;
-    task = new LogicalIOProcessorRuntimeTask(taskSpec, appAttemptNumber, tezConf, this,
+    task = new LogicalIOProcessorRuntimeTask(taskSpec, appAttemptNumber, tezConf, localDirs, this,
         serviceConsumerMetadata, startedInputsMap);
     taskReporter.registerTask(task, this);
     taskRunning = new AtomicBoolean(true);

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/SplitMetaInfoReaderTez.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/SplitMetaInfoReaderTez.java b/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/SplitMetaInfoReaderTez.java
index 6946001..4a8372a 100644
--- a/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/SplitMetaInfoReaderTez.java
+++ b/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/SplitMetaInfoReaderTez.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.WritableUtils;
 import org.apache.hadoop.mapreduce.split.JobSplit.TaskSplitMetaInfo;
-import org.apache.tez.common.TezJobConfig;
+import org.apache.tez.common.MRFrameworkConfigs;
 import org.apache.tez.mapreduce.hadoop.MRJobConfig;
 
 /**
@@ -59,7 +59,7 @@ public class SplitMetaInfoReaderTez {
         MRJobConfig.DEFAULT_SPLIT_METAINFO_MAXSIZE);
 
     // TODO NEWTEZ Figure out how this can be improved. i.e. access from context instead of setting in conf ?
-    String basePath = conf.get(TezJobConfig.TASK_LOCAL_RESOURCE_DIR, ".");
+    String basePath = conf.get(MRFrameworkConfigs.TASK_LOCAL_RESOURCE_DIR, ".");
     LOG.info("Attempting to find splits in dir: " + basePath);
     
     Path metaSplitFile = new Path(

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-mapreduce/src/main/java/org/apache/tez/common/MRFrameworkConfigs.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/common/MRFrameworkConfigs.java b/tez-mapreduce/src/main/java/org/apache/tez/common/MRFrameworkConfigs.java
new file mode 100644
index 0000000..0ea7730
--- /dev/null
+++ b/tez-mapreduce/src/main/java/org/apache/tez/common/MRFrameworkConfigs.java
@@ -0,0 +1,38 @@
+/*
+ * *
+ *  * Licensed to the Apache Software Foundation (ASF) under one
+ *  * or more contributor license agreements.  See the NOTICE file
+ *  * distributed with this work for additional information
+ *  * regarding copyright ownership.  The ASF licenses this file
+ *  * to you under the Apache License, Version 2.0 (the
+ *  * "License"); you may not use this file except in compliance
+ *  * with the License.  You may obtain a copy of the License at
+ *  *
+ *  *     http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package org.apache.tez.common;
+
+public class MRFrameworkConfigs {
+
+  /**
+   * One local dir for the specific job.
+   */
+
+  private static final String MR_FRAMEWORK_PREFIX = "tez.mr.framework.";
+
+  /**
+   * The directory which contains the localized files for this task.
+   */
+  public static final String TASK_LOCAL_RESOURCE_DIR = MR_FRAMEWORK_PREFIX + "task-local-resource.dir";
+  public static final String TASK_LOCAL_RESOURCE_DIR_DEFAULT = "/tmp";
+
+  public static final String JOB_LOCAL_DIR = MR_FRAMEWORK_PREFIX + "job.local.dir";
+}

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/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 0798101..90a5142 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
@@ -129,13 +129,13 @@ public class DeprecatedKeys {
     // Framework counters, like FILESYSTEM will likely be incompatible since
     // they enum key belongs to a different package.
     mrParamToDAGParamMap.put(MRJobConfig.COUNTERS_MAX_KEY,
-      TezJobConfig.COUNTERS_MAX_KEY);
+      TezJobConfig.TEZ_RUNTIME_COUNTERS_MAX_KEY);
     mrParamToDAGParamMap.put(MRJobConfig.COUNTER_GROUP_NAME_MAX_KEY,
-      TezJobConfig.COUNTER_GROUP_NAME_MAX_KEY);
+      TezJobConfig.TEZ_RUNTIME_COUNTER_GROUP_NAME_MAX_KEY);
     mrParamToDAGParamMap.put(MRJobConfig.COUNTER_GROUP_NAME_MAX_KEY,
-      TezJobConfig.COUNTER_NAME_MAX_KEY);
+      TezJobConfig.TEZ_RUNTIME_COUNTER_NAME_MAX_KEY);
     mrParamToDAGParamMap.put(MRJobConfig.COUNTER_GROUPS_MAX_KEY,
-      TezJobConfig.COUNTER_GROUPS_MAX_KEY);
+      TezJobConfig.TEZ_RUNTIME_COUNTER_GROUPS_MAX_KEY);
   }
 
   // TODO TEZAM4 Sometime, make sure this gets loaded by default. Insteaf of the current initialization in MRAppMaster, TezChild.
@@ -149,8 +149,8 @@ public class DeprecatedKeys {
     registerMRToRuntimeKeyTranslation(MRConfig.MAPRED_IFILE_READAHEAD, TezJobConfig.TEZ_RUNTIME_IFILE_READAHEAD);
 
     registerMRToRuntimeKeyTranslation(MRConfig.MAPRED_IFILE_READAHEAD_BYTES, TezJobConfig.TEZ_RUNTIME_IFILE_READAHEAD_BYTES);
-    
-    registerMRToRuntimeKeyTranslation(MRJobConfig.RECORDS_BEFORE_PROGRESS, TezJobConfig.RECORDS_BEFORE_PROGRESS);
+
+    registerMRToRuntimeKeyTranslation(MRJobConfig.RECORDS_BEFORE_PROGRESS, TezJobConfig.TEZ_RUNTIME_RECORDS_BEFORE_PROGRESS);
 
     registerMRToRuntimeKeyTranslation(MRJobConfig.IO_SORT_FACTOR, TezJobConfig.TEZ_RUNTIME_IO_SORT_FACTOR);
     
@@ -166,7 +166,7 @@ public class DeprecatedKeys {
     
     registerMRToRuntimeKeyTranslation(MRJobConfig.SHUFFLE_PARALLEL_COPIES, TezJobConfig.TEZ_RUNTIME_SHUFFLE_PARALLEL_COPIES);
     
-    registerMRToRuntimeKeyTranslation(MRJobConfig.SHUFFLE_FETCH_FAILURES, TezJobConfig.TEZ_RUNTIME_SHUFFLE_FETCH_FAILURES);
+    registerMRToRuntimeKeyTranslation(MRJobConfig.SHUFFLE_FETCH_FAILURES, TezJobConfig.TEZ_RUNTIME_SHUFFLE_FETCH_FAILURES_LIMIT);
     
     registerMRToRuntimeKeyTranslation(MRJobConfig.SHUFFLE_NOTIFY_READERROR, TezJobConfig.TEZ_RUNTIME_SHUFFLE_NOTIFY_READERROR);
     

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/partition/MRPartitioner.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/partition/MRPartitioner.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/partition/MRPartitioner.java
index c8edcf3..f4034fd 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/partition/MRPartitioner.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/partition/MRPartitioner.java
@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.util.ReflectionUtils;
-import org.apache.tez.common.TezJobConfig;
+import org.apache.tez.common.TezRuntimeFrameworkConfigs;
 import org.apache.tez.mapreduce.hadoop.MRJobConfig;
 import org.apache.tez.runtime.library.common.ConfigUtils;
 
@@ -39,7 +39,7 @@ public class MRPartitioner implements org.apache.tez.runtime.library.api.Partiti
 
   public MRPartitioner(Configuration conf) {
     this.useNewApi = ConfigUtils.useNewApi(conf);
-    int partitions = conf.getInt(TezJobConfig.TEZ_RUNTIME_NUM_EXPECTED_PARTITIONS, 1);
+    int partitions = conf.getInt(TezRuntimeFrameworkConfigs.TEZ_RUNTIME_NUM_EXPECTED_PARTITIONS, 1);
 
     if (useNewApi) {
       oldPartitioner = null;

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java
index 9ab64ba..ee002d8 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/processor/MRTask.java
@@ -61,7 +61,8 @@ import org.apache.hadoop.util.DiskChecker.DiskErrorException;
 import org.apache.hadoop.util.Progress;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.yarn.api.ApplicationConstants.Environment;
-import org.apache.tez.common.TezJobConfig;
+import org.apache.tez.common.MRFrameworkConfigs;
+import org.apache.tez.common.TezRuntimeFrameworkConfigs;
 import org.apache.tez.common.TezTaskStatus.State;
 import org.apache.tez.common.TezUtils;
 import org.apache.tez.common.counters.TezCounters;
@@ -210,14 +211,14 @@ public abstract class MRTask {
 
   private void configureLocalDirs() throws IOException {
     // TODO NEWTEZ Is most of this functionality required ?
-    jobConf.setStrings(TezJobConfig.LOCAL_DIRS, processorContext.getWorkDirs());
-    if (jobConf.get(TezJobConfig.TASK_LOCAL_RESOURCE_DIR) == null) {
-      jobConf.set(TezJobConfig.TASK_LOCAL_RESOURCE_DIR, System.getenv(Environment.PWD.name()));
+    jobConf.setStrings(TezRuntimeFrameworkConfigs.LOCAL_DIRS, processorContext.getWorkDirs());
+    if (jobConf.get(MRFrameworkConfigs.TASK_LOCAL_RESOURCE_DIR) == null) {
+      jobConf.set(MRFrameworkConfigs.TASK_LOCAL_RESOURCE_DIR, System.getenv(Environment.PWD.name()));
     }
 
     jobConf.setStrings(MRConfig.LOCAL_DIR, processorContext.getWorkDirs());
 
-    LocalDirAllocator lDirAlloc = new LocalDirAllocator(TezJobConfig.LOCAL_DIRS);
+    LocalDirAllocator lDirAlloc = new LocalDirAllocator(TezRuntimeFrameworkConfigs.LOCAL_DIRS);
     Path workDir = null;
     // First, try to find the JOB_LOCAL_DIR on this host.
     try {
@@ -247,7 +248,7 @@ public abstract class MRTask {
       }
     }
     // TODO NEWTEZ Is this required ?
-    jobConf.set(TezJobConfig.JOB_LOCAL_DIR, workDir.toString());
+    jobConf.set(MRFrameworkConfigs.JOB_LOCAL_DIR, workDir.toString());
     jobConf.set(MRJobConfig.JOB_LOCAL_DIR, workDir.toString());
   }
 
@@ -262,7 +263,7 @@ public abstract class MRTask {
   private static void setupDistributedCacheConfig(final JobConf job)
       throws IOException {
 
-    String localWorkDir = (job.get(TezJobConfig.TASK_LOCAL_RESOURCE_DIR));
+    String localWorkDir = (job.get(MRFrameworkConfigs.TASK_LOCAL_RESOURCE_DIR));
     // ^ ^ all symlinks are created in the current work-dir
 
     // Update the configuration object with localized archives.

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/hadoop/TestDeprecatedKeys.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/hadoop/TestDeprecatedKeys.java b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/hadoop/TestDeprecatedKeys.java
index 235570f..2dde271 100644
--- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/hadoop/TestDeprecatedKeys.java
+++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/hadoop/TestDeprecatedKeys.java
@@ -84,7 +84,7 @@ public class TestDeprecatedKeys {
     jobConf.setInt(TezJobConfig.TEZ_RUNTIME_COMBINE_MIN_SPILLS, 20);
     jobConf.setInt(Constants.TEZ_RUNTIME_TASK_MEMORY, 10);
     jobConf.setInt(TezJobConfig.TEZ_RUNTIME_SHUFFLE_PARALLEL_COPIES, 10);
-    jobConf.setInt(TezJobConfig.TEZ_RUNTIME_SHUFFLE_FETCH_FAILURES, 10);
+    jobConf.setInt(TezJobConfig.TEZ_RUNTIME_SHUFFLE_FETCH_FAILURES_LIMIT, 10);
     jobConf.setBoolean(TezJobConfig.TEZ_RUNTIME_SHUFFLE_NOTIFY_READERROR, true);
     jobConf.setInt(TezJobConfig.TEZ_RUNTIME_SHUFFLE_CONNECT_TIMEOUT, 10);
     jobConf.setInt(TezJobConfig.TEZ_RUNTIME_SHUFFLE_READ_TIMEOUT, 10);
@@ -114,7 +114,7 @@ public class TestDeprecatedKeys {
     assertEquals(20, jobConf.getInt(TezJobConfig.TEZ_RUNTIME_COMBINE_MIN_SPILLS, 0));
     assertEquals(10, jobConf.getInt(Constants.TEZ_RUNTIME_TASK_MEMORY, 0));
     assertEquals(10, jobConf.getInt(TezJobConfig.TEZ_RUNTIME_SHUFFLE_PARALLEL_COPIES, 0));
-    assertEquals(10, jobConf.getInt(TezJobConfig.TEZ_RUNTIME_SHUFFLE_FETCH_FAILURES, 0));
+    assertEquals(10, jobConf.getInt(TezJobConfig.TEZ_RUNTIME_SHUFFLE_FETCH_FAILURES_LIMIT, 0));
     assertEquals(true, jobConf.getBoolean(TezJobConfig.TEZ_RUNTIME_SHUFFLE_NOTIFY_READERROR, false));
     assertEquals(10, jobConf.getInt(TezJobConfig.TEZ_RUNTIME_SHUFFLE_CONNECT_TIMEOUT, 0));
     assertEquals(10, jobConf.getInt(TezJobConfig.TEZ_RUNTIME_SHUFFLE_READ_TIMEOUT, 0));

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java
index df7f2a9..69d6cb7 100644
--- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java
+++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java
@@ -48,7 +48,8 @@ import org.apache.hadoop.mapreduce.split.JobSplit.SplitMetaInfo;
 import org.apache.hadoop.mapreduce.split.SplitMetaInfoReaderTez;
 import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.util.DiskChecker.DiskErrorException;
-import org.apache.tez.common.TezJobConfig;
+import org.apache.tez.common.MRFrameworkConfigs;
+import org.apache.tez.common.TezRuntimeFrameworkConfigs;
 import org.apache.tez.common.TezUtils;
 import org.apache.tez.common.security.JobTokenIdentifier;
 import org.apache.tez.dag.api.ProcessorDescriptor;
@@ -74,15 +75,15 @@ public class MapUtils {
     String[] localSysDirs = new String[1];
     localSysDirs[0] = localDir;
 
-    conf.setStrings(TezJobConfig.LOCAL_DIRS, localSysDirs);
-    conf.set(TezJobConfig.TASK_LOCAL_RESOURCE_DIR, localDir);
+    conf.setStrings(TezRuntimeFrameworkConfigs.LOCAL_DIRS, localSysDirs);
+    conf.set(MRFrameworkConfigs.TASK_LOCAL_RESOURCE_DIR, localDir);
 
-    LOG.info(TezJobConfig.LOCAL_DIRS + " for child: "
-        + conf.get(TezJobConfig.LOCAL_DIRS));
-    LOG.info(TezJobConfig.TASK_LOCAL_RESOURCE_DIR + " for child: "
-        + conf.get(TezJobConfig.TASK_LOCAL_RESOURCE_DIR));
+    LOG.info(TezRuntimeFrameworkConfigs.LOCAL_DIRS + " for child: "
+        + conf.get(TezRuntimeFrameworkConfigs.LOCAL_DIRS));
+    LOG.info(MRFrameworkConfigs.TASK_LOCAL_RESOURCE_DIR + " for child: "
+        + conf.get(MRFrameworkConfigs.TASK_LOCAL_RESOURCE_DIR));
 
-    LocalDirAllocator lDirAlloc = new LocalDirAllocator(TezJobConfig.LOCAL_DIRS);
+    LocalDirAllocator lDirAlloc = new LocalDirAllocator(TezRuntimeFrameworkConfigs.LOCAL_DIRS);
     Path workDir = null;
     // First, try to find the JOB_LOCAL_DIR on this host.
     try {
@@ -110,7 +111,7 @@ public class MapUtils {
         throw new IOException("Mkdirs failed to create " + workDir.toString());
       }
     }
-    conf.set(TezJobConfig.JOB_LOCAL_DIR, workDir.toString());
+    conf.set(MRFrameworkConfigs.JOB_LOCAL_DIR, workDir.toString());
   }
   
   private static InputSplit 
@@ -156,8 +157,8 @@ public class MapUtils {
   
   private static void writeSplitFiles(FileSystem fs, JobConf conf,
       InputSplit split) throws IOException {
-    Path jobSplitFile = new Path(conf.get(TezJobConfig.TASK_LOCAL_RESOURCE_DIR,
-        TezJobConfig.DEFAULT_TASK_LOCAL_RESOURCE_DIR), MRJobConfig.JOB_SPLIT);
+    Path jobSplitFile = new Path(conf.get(MRFrameworkConfigs.TASK_LOCAL_RESOURCE_DIR,
+        MRFrameworkConfigs.TASK_LOCAL_RESOURCE_DIR_DEFAULT), MRJobConfig.JOB_SPLIT);
     LOG.info("Writing split to: " + jobSplitFile);
     FSDataOutputStream out = FileSystem.create(fs, jobSplitFile,
         new FsPermission(JOB_FILE_PERMISSION));
@@ -173,7 +174,7 @@ public class MapUtils {
     info = new JobSplit.SplitMetaInfo(locations, offset, split.getLength());
 
     Path jobSplitMetaInfoFile = new Path(
-        conf.get(TezJobConfig.TASK_LOCAL_RESOURCE_DIR),
+        conf.get(MRFrameworkConfigs.TASK_LOCAL_RESOURCE_DIR),
         MRJobConfig.JOB_SPLIT_METAINFO);
 
     FSDataOutputStream outMeta = FileSystem.create(fs, jobSplitMetaInfoFile,
@@ -218,6 +219,7 @@ public class MapUtils {
         taskSpec,
         0,
         jobConf,
+        new String[] {workDir.toString()},
         umbilical,
         serviceConsumerMetadata,
         HashMultimap.<String, String>create());

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/map/TestMapProcessor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/map/TestMapProcessor.java b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/map/TestMapProcessor.java
index ad56178..1bd24e7 100644
--- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/map/TestMapProcessor.java
+++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/map/TestMapProcessor.java
@@ -31,7 +31,9 @@ import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapreduce.MRConfig;
+import org.apache.tez.common.MRFrameworkConfigs;
 import org.apache.tez.common.TezJobConfig;
+import org.apache.tez.common.TezRuntimeFrameworkConfigs;
 import org.apache.tez.dag.api.InputDescriptor;
 import org.apache.tez.dag.api.OutputDescriptor;
 import org.apache.tez.mapreduce.TestUmbilical;
@@ -83,7 +85,7 @@ public class TestMapProcessor {
   
 
   public void setUpJobConf(JobConf job) {
-    job.set(TezJobConfig.LOCAL_DIRS, workDir.toString());
+    job.set(TezRuntimeFrameworkConfigs.LOCAL_DIRS, workDir.toString());
     job.set(MRConfig.LOCAL_DIR, workDir.toString());
     job.setClass(
         Constants.TEZ_RUNTIME_TASK_OUTPUT_MANAGER,
@@ -115,7 +117,7 @@ public class TestMapProcessor {
     JobConf job = new JobConf(stageConf);
     job.setBoolean(MRJobConfig.MR_TEZ_SPLITS_VIA_EVENTS, false);
 
-    job.set(TezJobConfig.TASK_LOCAL_RESOURCE_DIR, new Path(workDir,
+    job.set(MRFrameworkConfigs.TASK_LOCAL_RESOURCE_DIR, new Path(workDir,
         "localized-resources").toUri().toString());
     
     Path mapInput = new Path(workDir, "map0");

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/reduce/TestReduceProcessor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/reduce/TestReduceProcessor.java b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/reduce/TestReduceProcessor.java
index 77e563a..639cfcd 100644
--- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/reduce/TestReduceProcessor.java
+++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/reduce/TestReduceProcessor.java
@@ -37,7 +37,9 @@ import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.SequenceFileOutputFormat;
 import org.apache.hadoop.mapreduce.MRConfig;
 import org.apache.hadoop.security.token.Token;
+import org.apache.tez.common.MRFrameworkConfigs;
 import org.apache.tez.common.TezJobConfig;
+import org.apache.tez.common.TezRuntimeFrameworkConfigs;
 import org.apache.tez.common.TezUtils;
 import org.apache.tez.common.security.JobTokenIdentifier;
 import org.apache.tez.dag.api.InputDescriptor;
@@ -51,7 +53,6 @@ import org.apache.tez.mapreduce.hadoop.MRJobConfig;
 import org.apache.tez.mapreduce.hadoop.MultiStageMRConfToTezTranslator;
 import org.apache.tez.mapreduce.hadoop.MultiStageMRConfigUtil;
 import org.apache.tez.mapreduce.input.MRInputLegacy;
-import org.apache.tez.mapreduce.output.MROutput;
 import org.apache.tez.mapreduce.output.MROutputLegacy;
 import org.apache.tez.mapreduce.partition.MRPartitioner;
 import org.apache.tez.mapreduce.processor.MapUtils;
@@ -96,7 +97,7 @@ public class TestReduceProcessor {
   }
 
   public void setUpJobConf(JobConf job) {
-    job.set(TezJobConfig.LOCAL_DIRS, workDir.toString());
+    job.set(TezRuntimeFrameworkConfigs.LOCAL_DIRS, workDir.toString());
     job.set(MRConfig.LOCAL_DIR, workDir.toString());
     job.setClass(
         Constants.TEZ_RUNTIME_TASK_OUTPUT_MANAGER,
@@ -128,7 +129,7 @@ public class TestReduceProcessor {
     
     JobConf mapConf = new JobConf(mapStageConf);
     
-    mapConf.set(TezJobConfig.TASK_LOCAL_RESOURCE_DIR, new Path(workDir,
+    mapConf.set(MRFrameworkConfigs.TASK_LOCAL_RESOURCE_DIR, new Path(workDir,
         "localized-resources").toUri().toString());
     mapConf.setBoolean(MRJobConfig.MR_TEZ_SPLITS_VIA_EVENTS, false);
     
@@ -158,7 +159,7 @@ public class TestReduceProcessor {
         reduceVertexName);
     JobConf reduceConf = new JobConf(reduceStageConf);
     reduceConf.setOutputFormat(SequenceFileOutputFormat.class);
-    reduceConf.set(TezJobConfig.TASK_LOCAL_RESOURCE_DIR, new Path(workDir,
+    reduceConf.set(MRFrameworkConfigs.TASK_LOCAL_RESOURCE_DIR, new Path(workDir,
         "localized-resources").toUri().toString());
     FileOutputFormat.setOutputPath(reduceConf, new Path(workDir, "output"));
     ProcessorDescriptor reduceProcessorDesc = new ProcessorDescriptor(
@@ -186,6 +187,7 @@ public class TestReduceProcessor {
         taskSpec,
         0,
         reduceConf,
+        new String[] {workDir.toString()},
         new TestUmbilical(),
         serviceConsumerMetadata,
         HashMultimap.<String, String>create());

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
index 1290054..9be87a4 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
@@ -84,6 +84,7 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
   private static final Log LOG = LogFactory
       .getLog(LogicalIOProcessorRuntimeTask.class);
 
+  private final String[] localDirs;
   /** Responsible for maintaining order of Inputs */
   private final List<InputSpec> inputSpecs;
   private final ConcurrentHashMap<String, LogicalInput> inputsMap;
@@ -121,7 +122,7 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
   private final InputReadyTracker inputReadyTracker;
 
   public LogicalIOProcessorRuntimeTask(TaskSpec taskSpec, int appAttemptNumber,
-      Configuration tezConf, TezUmbilical tezUmbilical,
+      Configuration tezConf, String[] localDirs, TezUmbilical tezUmbilical,
       Map<String, ByteBuffer> serviceConsumerMetadata,
       Multimap<String, String> startedInputsMap) throws IOException {
     // TODO Remove jobToken from here post TEZ-421
@@ -130,6 +131,7 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
         + taskSpec);
     int numInputs = taskSpec.getInputs().size();
     int numOutputs = taskSpec.getOutputs().size();
+    this.localDirs = localDirs;
     this.inputSpecs = taskSpec.getInputs();
     this.inputsMap = new ConcurrentHashMap<String, LogicalInput>(numInputs);
     this.inputContextMap = new ConcurrentHashMap<String, TezInputContext>(numInputs);
@@ -461,7 +463,7 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
   }
 
   private TezInputContext createInputContext(Input input, InputSpec inputSpec, int inputIndex) {
-    TezInputContext inputContext = new TezInputContextImpl(tezConf,
+    TezInputContext inputContext = new TezInputContextImpl(tezConf, localDirs,
         appAttemptNumber, tezUmbilical,
         taskSpec.getDAGName(), taskSpec.getVertexName(),
         inputSpec.getSourceVertexName(), taskSpec.getTaskAttemptID(),
@@ -475,7 +477,7 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
   }
 
   private TezOutputContext createOutputContext(OutputSpec outputSpec, int outputIndex) {
-    TezOutputContext outputContext = new TezOutputContextImpl(tezConf,
+    TezOutputContext outputContext = new TezOutputContextImpl(tezConf, localDirs,
         appAttemptNumber, tezUmbilical,
         taskSpec.getDAGName(), taskSpec.getVertexName(),
         outputSpec.getDestinationVertexName(), taskSpec.getTaskAttemptID(),
@@ -489,7 +491,7 @@ public class LogicalIOProcessorRuntimeTask extends RuntimeTask {
   }
 
   private TezProcessorContext createProcessorContext() {
-    TezProcessorContext processorContext = new TezProcessorContextImpl(tezConf,
+    TezProcessorContext processorContext = new TezProcessorContextImpl(tezConf, localDirs,
         appAttemptNumber, tezUmbilical,
         taskSpec.getDAGName(), taskSpec.getVertexName(),
         taskSpec.getTaskAttemptID(),

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezInputContextImpl.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezInputContextImpl.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezInputContextImpl.java
index 9ef4c58..fed36ab 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezInputContextImpl.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezInputContextImpl.java
@@ -53,14 +53,14 @@ public class TezInputContextImpl extends TezTaskContextImpl
   private final InputReadyTracker inputReadyTracker;
 
   @Private
-  public TezInputContextImpl(Configuration conf, int appAttemptNumber,
+  public TezInputContextImpl(Configuration conf, String[] workDirs, int appAttemptNumber,
       TezUmbilical tezUmbilical, String dagName, String taskVertexName,
       String sourceVertexName, TezTaskAttemptID taskAttemptID,
       TezCounters counters, int inputIndex, @Nullable byte[] userPayload,
       RuntimeTask runtimeTask, Map<String, ByteBuffer> serviceConsumerMetadata,
       Map<String, String> auxServiceEnv, MemoryDistributor memDist,
       InputDescriptor inputDescriptor,  Input input, InputReadyTracker inputReadyTracker) {
-    super(conf, appAttemptNumber, dagName, taskVertexName, taskAttemptID,
+    super(conf, workDirs, appAttemptNumber, dagName, taskVertexName, taskAttemptID,
         wrapCounters(counters, taskVertexName, sourceVertexName, conf),
         runtimeTask, tezUmbilical, serviceConsumerMetadata,
         auxServiceEnv, memDist, inputDescriptor);

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezOutputContextImpl.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezOutputContextImpl.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezOutputContextImpl.java
index b612a6d..9a4d40b 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezOutputContextImpl.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezOutputContextImpl.java
@@ -49,7 +49,7 @@ public class TezOutputContextImpl extends TezTaskContextImpl
   private final int outputIndex;
 
   @Private
-  public TezOutputContextImpl(Configuration conf, int appAttemptNumber,
+  public TezOutputContextImpl(Configuration conf, String[] workDirs, int appAttemptNumber,
       TezUmbilical tezUmbilical, String dagName,
       String taskVertexName,
       String destinationVertexName,
@@ -58,7 +58,7 @@ public class TezOutputContextImpl extends TezTaskContextImpl
       Map<String, ByteBuffer> serviceConsumerMetadata,
       Map<String, String> auxServiceEnv, MemoryDistributor memDist,
       OutputDescriptor outputDescriptor) {
-    super(conf, appAttemptNumber, dagName, taskVertexName, taskAttemptID,
+    super(conf, workDirs, appAttemptNumber, dagName, taskVertexName, taskAttemptID,
         wrapCounters(counters, taskVertexName, destinationVertexName, conf),
         runtimeTask, tezUmbilical, serviceConsumerMetadata,
         auxServiceEnv, memDist, outputDescriptor);

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezProcessorContextImpl.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezProcessorContextImpl.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezProcessorContextImpl.java
index 2bf4d51..d840dc0 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezProcessorContextImpl.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezProcessorContextImpl.java
@@ -52,14 +52,14 @@ public class TezProcessorContextImpl extends TezTaskContextImpl implements TezPr
   private final EventMetaData sourceInfo;
   private final InputReadyTracker inputReadyTracker;
 
-  public TezProcessorContextImpl(Configuration conf, int appAttemptNumber,
+  public TezProcessorContextImpl(Configuration conf, String[] workDirs, int appAttemptNumber,
       TezUmbilical tezUmbilical, String dagName, String vertexName,
       TezTaskAttemptID taskAttemptID, TezCounters counters,
       @Nullable byte[] userPayload, RuntimeTask runtimeTask,
       Map<String, ByteBuffer> serviceConsumerMetadata,
       Map<String, String> auxServiceEnv, MemoryDistributor memDist,
       ProcessorDescriptor processorDescriptor, InputReadyTracker inputReadyTracker) {
-    super(conf, appAttemptNumber, dagName, vertexName, taskAttemptID,
+    super(conf, workDirs, appAttemptNumber, dagName, vertexName, taskAttemptID,
         counters, runtimeTask, tezUmbilical, serviceConsumerMetadata,
         auxServiceEnv, memDist, processorDescriptor);
     checkNotNull(inputReadyTracker, "inputReadyTracker is null");

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezTaskContextImpl.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezTaskContextImpl.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezTaskContextImpl.java
index 3a612ac..8cbdaf6 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezTaskContextImpl.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezTaskContextImpl.java
@@ -29,7 +29,6 @@ import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.util.AuxiliaryServiceHelper;
-import org.apache.tez.common.TezJobConfig;
 import org.apache.tez.common.counters.TezCounters;
 import org.apache.tez.dag.api.TezEntityDescriptor;
 import org.apache.tez.dag.records.TezTaskAttemptID;
@@ -60,7 +59,7 @@ public abstract class TezTaskContextImpl implements TezTaskContext {
   private final String dagName;
 
   @Private
-  public TezTaskContextImpl(Configuration conf, int appAttemptNumber,
+  public TezTaskContextImpl(Configuration conf, String[] workDirs, int appAttemptNumber,
       String dagName, String taskVertexName, TezTaskAttemptID taskAttemptID,
       TezCounters counters, RuntimeTask runtimeTask,
       TezUmbilical tezUmbilical, Map<String, ByteBuffer> serviceConsumerMetadata,
@@ -82,7 +81,7 @@ public abstract class TezTaskContextImpl implements TezTaskContext {
     this.counters = counters;
     // TODO Maybe change this to be task id specific at some point. For now
     // Shuffle code relies on this being a path specified by YARN
-    this.workDirs = this.conf.getStrings(TezJobConfig.LOCAL_DIRS);
+    this.workDirs = workDirs;
     this.runtimeTask = runtimeTask;
     this.tezUmbilical = tezUmbilical;
     this.serviceConsumerMetadata = serviceConsumerMetadata;

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-runtime-internals/src/main/java/org/apache/tez/runtime/common/resources/MemoryDistributor.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/common/resources/MemoryDistributor.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/common/resources/MemoryDistributor.java
index 7126577..c024d0a 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/common/resources/MemoryDistributor.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/common/resources/MemoryDistributor.java
@@ -74,8 +74,8 @@ public class MemoryDistributor {
    */
   public MemoryDistributor(int numTotalInputs, int numTotalOutputs, Configuration conf) {
     this.conf = conf;
-    isEnabled = conf.getBoolean(TezJobConfig.TEZ_TASK_SCALE_MEMORY_ENABLED,
-        TezJobConfig.TEZ_TASK_SCALE_MEMORY_ENABLED_DEFAULT);
+    isEnabled = conf.getBoolean(TezJobConfig.TEZ_RUNTIME_SCALE_TASK_MEMORY_ENABLED,
+        TezJobConfig.TEZ_RUNTIME_SCALE_TASK_MEMORY_ENABLED_DEFAULT);
     
 
     this.numTotalInputs = numTotalInputs;
@@ -119,8 +119,8 @@ public class MemoryDistributor {
         }
       });
     } else {
-      String allocatorClassName = conf.get(TezJobConfig.TEZ_TASK_SCALE_MEMORY_ALLOCATOR_CLASS,
-          TezJobConfig.TEZ_TASK_SCALE_MEMORY_ALLOCATOR_CLASS_DEFAULT);
+      String allocatorClassName = conf.get(TezJobConfig.TEZ_RUNTIME_SCALE_TASK_MEMORY_ALLOCATOR_CLASS,
+          TezJobConfig.TEZ_RUNTIME_SCALE_TASK_MEMORY_ALLOCATOR_CLASS_DEFAULT);
       LOG.info("Using Allocator class: " + allocatorClassName);
       InitialMemoryAllocator allocator = RuntimeUtils.createClazzInstance(allocatorClassName);
       allocator.setConf(conf);

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-runtime-internals/src/main/java/org/apache/tez/runtime/common/resources/ScalingAllocator.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/common/resources/ScalingAllocator.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/common/resources/ScalingAllocator.java
index 655521a..8f08b6e 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/common/resources/ScalingAllocator.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/common/resources/ScalingAllocator.java
@@ -53,7 +53,7 @@ public class ScalingAllocator implements InitialMemoryAllocator {
     }
 
     // Take a certain amount of memory away for general usage.
-    double reserveFraction = conf.getDouble(TezJobConfig.TEZ_TASK_SCALE_MEMORY_RESERVE_FRACTION,
+    double reserveFraction = conf.getDouble(TezJobConfig.TEZ_RUNTIME_SCALE_TASK_MEMORY_RESERVE_FRACTION,
         DEFAULT_RESERVE_FRACTION);
     Preconditions.checkState(reserveFraction >= 0.0d && reserveFraction <= 1.0d);
     availableForAllocation = (long) (availableForAllocation - (reserveFraction * availableForAllocation));

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-runtime-internals/src/main/java/org/apache/tez/runtime/metrics/TaskCounterUpdater.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/metrics/TaskCounterUpdater.java b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/metrics/TaskCounterUpdater.java
index d8ad9f0..5c443df 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/metrics/TaskCounterUpdater.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/metrics/TaskCounterUpdater.java
@@ -139,7 +139,7 @@ public class TaskCounterUpdater {
   
   private void initResourceCalculatorPlugin() {
     Class<? extends ResourceCalculatorProcessTree> clazz = this.conf.getClass(
-        TezJobConfig.TEZ_RESOURCE_CALCULATOR_PROCESS_TREE_CLASS, null,
+        TezJobConfig.TEZ_RUNTIME_RESOURCE_CALCULATOR_PROCESS_TREE_CLASS, null,
         ResourceCalculatorProcessTree.class); 
 
     pTree = ResourceCalculatorProcessTree.getResourceCalculatorProcessTree(

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-runtime-internals/src/test/java/org/apache/tez/runtime/TestLogicalIOProcessorRuntimeTask.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/test/java/org/apache/tez/runtime/TestLogicalIOProcessorRuntimeTask.java b/tez-runtime-internals/src/test/java/org/apache/tez/runtime/TestLogicalIOProcessorRuntimeTask.java
index 5eb25c8..d2d8f29 100644
--- a/tez-runtime-internals/src/test/java/org/apache/tez/runtime/TestLogicalIOProcessorRuntimeTask.java
+++ b/tez-runtime-internals/src/test/java/org/apache/tez/runtime/TestLogicalIOProcessorRuntimeTask.java
@@ -69,7 +69,7 @@ public class TestLogicalIOProcessorRuntimeTask {
     TezTaskAttemptID taId2 = createTaskAttemptID(vertexId, 2);
     TaskSpec task2 = createTaskSpec(taId2, "dag2", "vertex1");
 
-    LogicalIOProcessorRuntimeTask lio1 = new LogicalIOProcessorRuntimeTask(task1, 0, tezConf,
+    LogicalIOProcessorRuntimeTask lio1 = new LogicalIOProcessorRuntimeTask(task1, 0, tezConf, null,
         umbilical, serviceConsumerMetadata, startedInputsMap);
 
     lio1.initialize();
@@ -81,7 +81,7 @@ public class TestLogicalIOProcessorRuntimeTask {
     assertEquals(1, TestInput.startCount);
     assertEquals(0, TestOutput.startCount);
 
-    LogicalIOProcessorRuntimeTask lio2 = new LogicalIOProcessorRuntimeTask(task2, 0, tezConf,
+    LogicalIOProcessorRuntimeTask lio2 = new LogicalIOProcessorRuntimeTask(task2, 0, tezConf, null,
         umbilical, serviceConsumerMetadata, startedInputsMap);
 
     lio2.initialize();

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-runtime-internals/src/test/java/org/apache/tez/runtime/common/resources/TestMemoryDistributor.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/test/java/org/apache/tez/runtime/common/resources/TestMemoryDistributor.java b/tez-runtime-internals/src/test/java/org/apache/tez/runtime/common/resources/TestMemoryDistributor.java
index 61c2e86..18e5766 100644
--- a/tez-runtime-internals/src/test/java/org/apache/tez/runtime/common/resources/TestMemoryDistributor.java
+++ b/tez-runtime-internals/src/test/java/org/apache/tez/runtime/common/resources/TestMemoryDistributor.java
@@ -41,8 +41,8 @@ public class TestMemoryDistributor {
   
   @Before
   public void setup() {
-    conf.setBoolean(TezJobConfig.TEZ_TASK_SCALE_MEMORY_ENABLED, true);
-    conf.set(TezJobConfig.TEZ_TASK_SCALE_MEMORY_ALLOCATOR_CLASS,
+    conf.setBoolean(TezJobConfig.TEZ_RUNTIME_SCALE_TASK_MEMORY_ENABLED, true);
+    conf.set(TezJobConfig.TEZ_RUNTIME_SCALE_TASK_MEMORY_ALLOCATOR_CLASS,
         ScalingAllocator.class.getName());
   }
   
@@ -151,7 +151,7 @@ public class TestMemoryDistributor {
   public void testScalingDisabled() {
     // Real world values
     Configuration conf = new Configuration(this.conf);
-    conf.setBoolean(TezJobConfig.TEZ_TASK_SCALE_MEMORY_ENABLED, false);
+    conf.setBoolean(TezJobConfig.TEZ_RUNTIME_SCALE_TASK_MEMORY_ENABLED, false);
     MemoryDistributor dist = new MemoryDistributor(2, 0, conf);
     
     dist.setJvmMemory(207093760l);
@@ -177,7 +177,7 @@ public class TestMemoryDistributor {
   @Test(timeout = 5000)
   public void testReserveFractionConfigured() {
     Configuration conf = new Configuration(this.conf);
-    conf.setDouble(TezJobConfig.TEZ_TASK_SCALE_MEMORY_RESERVE_FRACTION, 0.5d);
+    conf.setDouble(TezJobConfig.TEZ_RUNTIME_SCALE_TASK_MEMORY_RESERVE_FRACTION, 0.5d);
     MemoryDistributor dist = new MemoryDistributor(2, 1, conf);
     
     dist.setJvmMemory(10000l);

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-runtime-library/src/main/java/org/apache/tez/common/TezRuntimeFrameworkConfigs.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/common/TezRuntimeFrameworkConfigs.java b/tez-runtime-library/src/main/java/org/apache/tez/common/TezRuntimeFrameworkConfigs.java
new file mode 100644
index 0000000..db5022c
--- /dev/null
+++ b/tez-runtime-library/src/main/java/org/apache/tez/common/TezRuntimeFrameworkConfigs.java
@@ -0,0 +1,44 @@
+
+/*
+ * *
+ *  * Licensed to the Apache Software Foundation (ASF) under one
+ *  * or more contributor license agreements.  See the NOTICE file
+ *  * distributed with this work for additional information
+ *  * regarding copyright ownership.  The ASF licenses this file
+ *  * to you under the Apache License, Version 2.0 (the
+ *  * "License"); you may not use this file except in compliance
+ *  * with the License.  You may obtain a copy of the License at
+ *  *
+ *  *     http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package org.apache.tez.common;
+
+import org.apache.hadoop.classification.InterfaceAudience;
+
+/**
+ * Configuration parameters which are internal to the Inputs and Outputs which exist in the Runtime
+ */
+@InterfaceAudience.Private
+public class TezRuntimeFrameworkConfigs {
+
+  private static final String TEZ_RUNTIME_FRAMEWORK_PREFIX = "tez.runtime.framework.";
+
+  /**
+   * List of directories available to the Runtime.
+   */
+  public static final String LOCAL_DIRS = TEZ_RUNTIME_FRAMEWORK_PREFIX + "local.dirs";
+
+  public static final String TEZ_RUNTIME_NUM_EXPECTED_PARTITIONS = TEZ_RUNTIME_FRAMEWORK_PREFIX + "num.expected.partitions";
+
+  public static final String TEZ_RUNTIME_METRICS_SESSION_ID = TEZ_RUNTIME_FRAMEWORK_PREFIX +
+      "metrics.session.id";
+  public static final String TEZ_RUNTIME_METRICS_SESSION_ID_DEFAULT = "";
+}

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/Constants.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/Constants.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/Constants.java
index 33cd0f6..d8b29cb 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/Constants.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/Constants.java
@@ -32,7 +32,9 @@ public class Constants {
 
   public static final int MAP_OUTPUT_INDEX_RECORD_LENGTH = 24;
   public static String MERGED_OUTPUT_PREFIX = ".merged";
-  
+
+  public static final long DEFAULT_COMBINE_RECORDS_BEFORE_PROGRESS = 10000;
+
   // TODO NEWTEZ Remove this constant once the old code is removed.
   public static final String TEZ_RUNTIME_TASK_ATTEMPT_ID = 
       "tez.runtime.task.attempt.id";

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/afe0c2da/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/localshuffle/LocalShuffle.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/localshuffle/LocalShuffle.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/localshuffle/LocalShuffle.java
index fe05410..45c3e54 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/localshuffle/LocalShuffle.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/localshuffle/LocalShuffle.java
@@ -75,7 +75,7 @@ public class LocalShuffle {
     this.sortFactor =
         conf.getInt(
             TezJobConfig.TEZ_RUNTIME_IO_SORT_FACTOR, 
-            TezJobConfig.DEFAULT_TEZ_RUNTIME_IO_SORT_FACTOR);
+            TezJobConfig.TEZ_RUNTIME_IO_SORT_FACTOR_DEFAULT);
     
     this.rfs = FileSystem.getLocal(conf).getRaw();
 


Mime
View raw message