You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2015/02/04 13:20:18 UTC

hadoop git commit: HADOOP-11544. Remove unused configuration keys for tracing. Contributed by Masatake Iwasaki.

Repository: hadoop
Updated Branches:
  refs/heads/trunk 26dee1486 -> 42548f4dc


HADOOP-11544. Remove unused configuration keys for tracing. Contributed by Masatake Iwasaki.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/42548f4d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/42548f4d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/42548f4d

Branch: refs/heads/trunk
Commit: 42548f4dc2b2e8ace891b970c2c6712c02bb43ea
Parents: 26dee14
Author: Akira Ajisaka <aa...@apache.org>
Authored: Wed Feb 4 04:17:14 2015 -0800
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Wed Feb 4 04:18:17 2015 -0800

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt         |  3 +++
 .../org/apache/hadoop/fs/CommonConfigurationKeys.java   |  3 ---
 .../hadoop-common/src/main/resources/core-default.xml   | 12 ------------
 3 files changed, 3 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/42548f4d/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 4c71ab2..75cbd2f 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -530,6 +530,9 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11442. hadoop-azure: Create test jar.
     (Shashank Khandelwal via cnauroth)
 
+    HADOOP-11544. Remove unused configuration keys for tracing. (Masatake
+    Iwasaki via aajisaka)
+
   OPTIMIZATIONS
 
     HADOOP-11323. WritableComparator#compare keeps reference to byte array.

http://git-wip-us.apache.org/repos/asf/hadoop/blob/42548f4d/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
index 748c552..442dc7d 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
@@ -286,7 +286,4 @@ public class CommonConfigurationKeys extends CommonConfigurationKeysPublic {
   public static final String NFS_EXPORTS_ALLOWED_HOSTS_SEPARATOR = ";";
   public static final String NFS_EXPORTS_ALLOWED_HOSTS_KEY = "nfs.exports.allowed.hosts";
   public static final String NFS_EXPORTS_ALLOWED_HOSTS_KEY_DEFAULT = "* rw";
-
-  public static final String  HADOOP_TRACE_SAMPLER = "hadoop.htrace.sampler";
-  public static final String  HADOOP_TRACE_SAMPLER_DEFAULT = "NeverSampler";
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/42548f4d/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
index 598ce6f..f31db31 100644
--- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
+++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
@@ -1654,18 +1654,6 @@ for ldap providers in the same way as above does.
 </property>
 
 <property>
-  <name>hadoop.htrace.sampler</name>
-  <value>NeverSampler</value>
-  <description>
-    Configure the samplers for HTrace, the value can be NeverSampler,
-    AlwaysSampler or ProbabilitySampler. NeverSampler: HTrace is OFF 
-    for all spans; AlwaysSampler: HTrace is ON for all spans;
-    ProbabilitySampler: HTrace is ON for some percentage% of top-level 
-    spans.
-  </description>
-</property>
-
-<property>
   <name>hadoop.htrace.spanreceiver.classes</name>
   <value></value>
   <description>