hadoop git commit: HDFS-8102. Separate webhdfs retry configuration keys from DFSConfigKeys. Contributed by Haohui Mai.

2015-04-09 Thread wheat9 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 aec1c5ec7 - e34afb48d


HDFS-8102. Separate webhdfs retry configuration keys from DFSConfigKeys. 
Contributed by Haohui Mai.


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

Branch: refs/heads/branch-2
Commit: e34afb48d48872df60c8fb5bd0ff7eb25ad4ee9e
Parents: aec1c5e
Author: Haohui Mai whe...@apache.org
Authored: Thu Apr 9 14:36:27 2015 -0700
Committer: Haohui Mai whe...@apache.org
Committed: Thu Apr 9 14:36:35 2015 -0700

--
 .../hdfs/client/HdfsClientConfigKeys.java   | 17 +++
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt |  3 ++
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   | 50 +++-
 .../hadoop/hdfs/web/WebHdfsFileSystem.java  | 25 +-
 .../hadoop/hdfs/TestDFSClientRetries.java   |  2 +-
 5 files changed, 71 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e34afb48/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 604d60e..7316e3b 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
@@ -60,4 +60,21 @@ public interface HdfsClientConfigKeys {
 public static final int WINDOW_BASE_DEFAULT
 = 3000;
   }
+
+  // WebHDFS retry configuration policy
+  interface WebHdfsRetry {
+String  PREFIX = HdfsClientConfigKeys.PREFIX + http.client.;
+String  RETRY_POLICY_ENABLED_KEY = PREFIX + 
dfs.http.client.retry.policy.enabled;
+boolean RETRY_POLICY_ENABLED_DEFAULT = false;
+String  RETRY_POLICY_SPEC_KEY = PREFIX + 
dfs.http.client.retry.policy.spec;
+String  RETRY_POLICY_SPEC_DEFAULT = 1,6,6,10; //t1,n1,t2,n2,...
+String  FAILOVER_MAX_ATTEMPTS_KEY = PREFIX + 
dfs.http.client.failover.max.attempts;
+int FAILOVER_MAX_ATTEMPTS_DEFAULT =  15;
+String  RETRY_MAX_ATTEMPTS_KEY = PREFIX + 
dfs.http.client.retry.max.attempts;
+int RETRY_MAX_ATTEMPTS_DEFAULT = 10;
+String  FAILOVER_SLEEPTIME_BASE_KEY = PREFIX + 
dfs.http.client.failover.sleep.base.millis;
+int FAILOVER_SLEEPTIME_BASE_DEFAULT = 500;
+String  FAILOVER_SLEEPTIME_MAX_KEY = PREFIX + 
dfs.http.client.failover.sleep.max.millis;
+int FAILOVER_SLEEPTIME_MAX_DEFAULT =  15000;
+  }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e34afb48/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 6914934..b53b2c7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -94,6 +94,9 @@ Release 2.8.0 - UNRELEASED
 HDFS-8099. Change DFSInputStream has been closed already message to
 debug log level (Charles Lamb via Colin P. McCabe)
 
+HDFS-8102. Separate webhdfs retry configuration keys from DFSConfigKeys.
+(wheat9)
+
   OPTIMIZATIONS
 
 HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e34afb48/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 d8b1692..777bf76 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
@@ -607,19 +607,43 @@ public class DFSConfigKeys extends 
CommonConfigurationKeys {
   public static final long   DFS_DATANODE_XCEIVER_STOP_TIMEOUT_MILLIS_DEFAULT 
= 6;
 
   // WebHDFS retry policy
-  public static final String  DFS_HTTP_CLIENT_RETRY_POLICY_ENABLED_KEY = 
dfs.http.client.retry.policy.enabled;
-  public static final boolean DFS_HTTP_CLIENT_RETRY_POLICY_ENABLED_DEFAULT = 
false;
-  public static final String  DFS_HTTP_CLIENT_RETRY_POLICY_SPEC_KEY =

hadoop git commit: HDFS-8102. Separate webhdfs retry configuration keys from DFSConfigKeys. Contributed by Haohui Mai.

2015-04-09 Thread wheat9 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 623fd46c1 - af9d4fede


HDFS-8102. Separate webhdfs retry configuration keys from DFSConfigKeys. 
Contributed by Haohui Mai.


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

Branch: refs/heads/trunk
Commit: af9d4fede535f0699d08e592d5c4e133a5823663
Parents: 623fd46
Author: Haohui Mai whe...@apache.org
Authored: Thu Apr 9 14:36:27 2015 -0700
Committer: Haohui Mai whe...@apache.org
Committed: Thu Apr 9 14:36:27 2015 -0700

--
 .../hdfs/client/HdfsClientConfigKeys.java   | 17 +++
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt |  3 ++
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   | 50 +++-
 .../hadoop/hdfs/web/WebHdfsFileSystem.java  | 25 +-
 .../hadoop/hdfs/TestDFSClientRetries.java   |  2 +-
 5 files changed, 71 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/af9d4fed/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 604d60e..7316e3b 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
@@ -60,4 +60,21 @@ public interface HdfsClientConfigKeys {
 public static final int WINDOW_BASE_DEFAULT
 = 3000;
   }
+
+  // WebHDFS retry configuration policy
+  interface WebHdfsRetry {
+String  PREFIX = HdfsClientConfigKeys.PREFIX + http.client.;
+String  RETRY_POLICY_ENABLED_KEY = PREFIX + 
dfs.http.client.retry.policy.enabled;
+boolean RETRY_POLICY_ENABLED_DEFAULT = false;
+String  RETRY_POLICY_SPEC_KEY = PREFIX + 
dfs.http.client.retry.policy.spec;
+String  RETRY_POLICY_SPEC_DEFAULT = 1,6,6,10; //t1,n1,t2,n2,...
+String  FAILOVER_MAX_ATTEMPTS_KEY = PREFIX + 
dfs.http.client.failover.max.attempts;
+int FAILOVER_MAX_ATTEMPTS_DEFAULT =  15;
+String  RETRY_MAX_ATTEMPTS_KEY = PREFIX + 
dfs.http.client.retry.max.attempts;
+int RETRY_MAX_ATTEMPTS_DEFAULT = 10;
+String  FAILOVER_SLEEPTIME_BASE_KEY = PREFIX + 
dfs.http.client.failover.sleep.base.millis;
+int FAILOVER_SLEEPTIME_BASE_DEFAULT = 500;
+String  FAILOVER_SLEEPTIME_MAX_KEY = PREFIX + 
dfs.http.client.failover.sleep.max.millis;
+int FAILOVER_SLEEPTIME_MAX_DEFAULT =  15000;
+  }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/af9d4fed/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 695dc36..e091a65 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -412,6 +412,9 @@ Release 2.8.0 - UNRELEASED
 HDFS-8099. Change DFSInputStream has been closed already message to
 debug log level (Charles Lamb via Colin P. McCabe)
 
+HDFS-8102. Separate webhdfs retry configuration keys from DFSConfigKeys.
+(wheat9)
+
   OPTIMIZATIONS
 
 HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than

http://git-wip-us.apache.org/repos/asf/hadoop/blob/af9d4fed/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 d0ca125..ce08075 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
@@ -601,19 +601,43 @@ public class DFSConfigKeys extends 
CommonConfigurationKeys {
   public static final long   DFS_DATANODE_XCEIVER_STOP_TIMEOUT_MILLIS_DEFAULT 
= 6;
 
   // WebHDFS retry policy
-  public static final String  DFS_HTTP_CLIENT_RETRY_POLICY_ENABLED_KEY = 
dfs.http.client.retry.policy.enabled;
-  public static final boolean DFS_HTTP_CLIENT_RETRY_POLICY_ENABLED_DEFAULT = 
false;
-  public static final String  DFS_HTTP_CLIENT_RETRY_POLICY_SPEC_KEY =