HDFS-10266. Remove unused properties dfs.client.file-block-storage-locations.num-threads and dfs.client.file-block-storage-locations.timeout.millis. Contributed by Ray Chiang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9c32f878 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9c32f878 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9c32f878 Branch: refs/heads/HDFS-1312 Commit: 9c32f8785e8d7957e3f8a3946cfd15a4d5c82fec Parents: e82f961 Author: Akira Ajisaka <aajis...@apache.org> Authored: Fri Apr 8 15:32:13 2016 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Fri Apr 8 15:32:13 2016 +0900 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/HdfsConfiguration.java | 3 --- .../hadoop/hdfs/client/HdfsClientConfigKeys.java | 6 ------ .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 18 ------------------ .../src/main/data/2jobs2min-rumen-jh.json | 6 ------ 4 files changed, 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9c32f878/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/HdfsConfiguration.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/HdfsConfiguration.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/HdfsConfiguration.java index e93e6f1..b11aa4e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/HdfsConfiguration.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/HdfsConfiguration.java @@ -139,9 +139,6 @@ public class HdfsConfiguration extends Configuration { HdfsClientConfigKeys.DFS_NAMESERVICES), new DeprecationDelta("dfs.federation.nameservice.id", DeprecatedKeys.DFS_NAMESERVICE_ID), - new DeprecationDelta("dfs.client.file-block-storage-locations.timeout", - HdfsClientConfigKeys. - DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_TIMEOUT_MS), }); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/9c32f878/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsClientConfigKeys.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsClientConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsClientConfigKeys.java index d50c89e..9edffca 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsClientConfigKeys.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsClientConfigKeys.java @@ -97,12 +97,6 @@ public interface HdfsClientConfigKeys { int DFS_CLIENT_CACHED_CONN_RETRY_DEFAULT = 3; String DFS_CLIENT_CONTEXT = "dfs.client.context"; String DFS_CLIENT_CONTEXT_DEFAULT = "default"; - String DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_NUM_THREADS = - "dfs.client.file-block-storage-locations.num-threads"; - int DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_NUM_THREADS_DEFAULT = 10; - String DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_TIMEOUT_MS = - "dfs.client.file-block-storage-locations.timeout.millis"; - int DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_TIMEOUT_MS_DEFAULT = 1000; String DFS_CLIENT_USE_LEGACY_BLOCKREADER = "dfs.client.use.legacy.blockreader"; boolean DFS_CLIENT_USE_LEGACY_BLOCKREADER_DEFAULT = false; http://git-wip-us.apache.org/repos/asf/hadoop/blob/9c32f878/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java index 9424662..ad74aa1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java @@ -1197,24 +1197,6 @@ public class DFSConfigKeys extends CommonConfigurationKeys { @Deprecated public static final String DFS_CLIENT_CONTEXT_DEFAULT = HdfsClientConfigKeys.DFS_CLIENT_CONTEXT_DEFAULT; - @Deprecated - public static final String - DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_NUM_THREADS = - HdfsClientConfigKeys.DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_NUM_THREADS; - @Deprecated - public static final int - DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_NUM_THREADS_DEFAULT = - HdfsClientConfigKeys - .DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_NUM_THREADS_DEFAULT; - @Deprecated - public static final String - DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_TIMEOUT_MS = - HdfsClientConfigKeys.DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_TIMEOUT_MS; - @Deprecated - public static final int - DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_TIMEOUT_MS_DEFAULT = - HdfsClientConfigKeys - .DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_TIMEOUT_MS_DEFAULT; @Deprecated public static final String DFS_CLIENT_DATANODE_RESTART_TIMEOUT_KEY = http://git-wip-us.apache.org/repos/asf/hadoop/blob/9c32f878/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json b/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json index 9d90deb..839f767 100644 --- a/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json +++ b/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json @@ -4701,7 +4701,6 @@ "dfs.namenode.avoid.read.stale.datanode" : "false", "mapreduce.job.reduces" : "0", "mapreduce.map.sort.spill.percent" : "0.8", - "dfs.client.file-block-storage-locations.timeout" : "60", "dfs.datanode.drop.cache.behind.writes" : "false", "mapreduce.job.end-notification.retry.interval" : "1", "mapreduce.job.maps" : "96", @@ -4800,7 +4799,6 @@ "dfs.datanode.directoryscan.interval" : "21600", "yarn.resourcemanager.address" : "a2115.smile.com:8032", "yarn.nodemanager.health-checker.interval-ms" : "600000", - "dfs.client.file-block-storage-locations.num-threads" : "10", "yarn.resourcemanager.container-tokens.master-key-rolling-interval-secs" : "86400", "mapreduce.reduce.markreset.buffer.percent" : "0.0", "hadoop.security.group.mapping.ldap.directory.search.timeout" : "10000", @@ -9806,7 +9804,6 @@ "dfs.namenode.avoid.read.stale.datanode" : "false", "mapreduce.job.reduces" : "0", "mapreduce.map.sort.spill.percent" : "0.8", - "dfs.client.file-block-storage-locations.timeout" : "60", "dfs.datanode.drop.cache.behind.writes" : "false", "mapreduce.job.end-notification.retry.interval" : "1", "mapreduce.job.maps" : "96", @@ -9905,7 +9902,6 @@ "dfs.datanode.directoryscan.interval" : "21600", "yarn.resourcemanager.address" : "a2115.smile.com:8032", "yarn.nodemanager.health-checker.interval-ms" : "600000", - "dfs.client.file-block-storage-locations.num-threads" : "10", "yarn.resourcemanager.container-tokens.master-key-rolling-interval-secs" : "86400", "mapreduce.reduce.markreset.buffer.percent" : "0.0", "hadoop.security.group.mapping.ldap.directory.search.timeout" : "10000", @@ -10412,7 +10408,6 @@ "dfs.namenode.avoid.read.stale.datanode" : "false", "mapreduce.job.reduces" : "0", "mapreduce.map.sort.spill.percent" : "0.8", -"dfs.client.file-block-storage-locations.timeout" : "60", "dfs.datanode.drop.cache.behind.writes" : "false", "mapreduce.job.end-notification.retry.interval" : "1", "mapreduce.job.maps" : "96", @@ -10511,7 +10506,6 @@ "dfs.datanode.directoryscan.interval" : "21600", "yarn.resourcemanager.address" : "a2115.smile.com:8032", "yarn.nodemanager.health-checker.interval-ms" : "600000", -"dfs.client.file-block-storage-locations.num-threads" : "10", "yarn.resourcemanager.container-tokens.master-key-rolling-interval-secs" : "86400", "mapreduce.reduce.markreset.buffer.percent" : "0.0", "hadoop.security.group.mapping.ldap.directory.search.timeout" : "10000",
