[34/48] hadoop git commit: Add missing files from HDFS-9005. (lei)

2016-03-28 Thread aengineer 
Add missing files from HDFS-9005. (lei)


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

Branch: refs/heads/HDFS-7240
Commit: fde8ac5d8514f5146f438f8d0794116aaef20416
Parents: 4fcfea7
Author: Lei Xu 
Authored: Fri Mar 25 17:10:31 2016 -0700
Committer: Lei Xu 
Committed: Fri Mar 25 17:11:35 2016 -0700

--
 .../apache/hadoop/hdfs/protocol/DatanodeID.java |   6 +
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |   4 +-
 .../server/blockmanagement/DatanodeManager.java |  59 +---
 .../server/blockmanagement/HostFileManager.java | 147 +--
 .../src/main/resources/hdfs-default.xml |  14 ++
 .../src/site/markdown/HdfsUserGuide.md  |   6 +-
 .../apache/hadoop/hdfs/TestDatanodeReport.java  |  57 ++-
 .../TestBlocksWithNotEnoughRacks.java   |  34 ++---
 .../blockmanagement/TestDatanodeManager.java|   8 +-
 .../blockmanagement/TestHostFileManager.java|  10 +-
 .../hdfs/server/namenode/TestHostsFiles.java|  70 +
 .../server/namenode/TestNameNodeMXBean.java |  25 ++--
 .../hdfs/server/namenode/TestStartup.java   |  54 +--
 13 files changed, 227 insertions(+), 267 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/fde8ac5d/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
index 5fd845d..af720c7 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
@@ -23,6 +23,8 @@ import org.apache.hadoop.classification.InterfaceStability;
 
 import com.google.common.annotations.VisibleForTesting;
 
+import java.net.InetSocketAddress;
+
 /**
  * This class represents the primary identifier for a Datanode.
  * Datanodes are identified by how they can be contacted (hostname
@@ -274,4 +276,8 @@ public class DatanodeID implements Comparable {
   public int compareTo(DatanodeID that) {
 return getXferAddr().compareTo(that.getXferAddr());
   }
+
+  public InetSocketAddress getResolvedAddress() {
+return new InetSocketAddress(this.getIpAddr(), this.getXferPort());
+  }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fde8ac5d/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 844fec2..9424662 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
@@ -415,12 +415,12 @@ public class DFSConfigKeys extends 
CommonConfigurationKeys {
   public static final String  DFS_METRICS_PERCENTILES_INTERVALS_KEY = 
"dfs.metrics.percentiles.intervals";
   public static final String  DFS_DATANODE_HOST_NAME_KEY =
   HdfsClientConfigKeys.DeprecatedKeys.DFS_DATANODE_HOST_NAME_KEY;
-  public static final String  DFS_NAMENODE_HOSTS_KEY = "dfs.namenode.hosts";
-  public static final String  DFS_NAMENODE_HOSTS_EXCLUDE_KEY = 
"dfs.namenode.hosts.exclude";
   public static final String  DFS_NAMENODE_CHECKPOINT_DIR_KEY =
   HdfsClientConfigKeys.DeprecatedKeys.DFS_NAMENODE_CHECKPOINT_DIR_KEY;
   public static final String  DFS_NAMENODE_CHECKPOINT_EDITS_DIR_KEY =
   
HdfsClientConfigKeys.DeprecatedKeys.DFS_NAMENODE_CHECKPOINT_EDITS_DIR_KEY;
+  public static final String  DFS_NAMENODE_HOSTS_PROVIDER_CLASSNAME_KEY =
+  "dfs.namenode.hosts.provider.classname";
   public static final String  DFS_HOSTS = "dfs.hosts";
   public static final String  DFS_HOSTS_EXCLUDE = "dfs.hosts.exclude";
   public static final String  DFS_NAMENODE_AUDIT_LOGGERS_KEY = 
"dfs.namenode.audit.loggers";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fde8ac5d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
--
diff --git

[2/2] hadoop git commit: Add missing files from HDFS-9005. (lei)

2016-03-25 Thread lei 
Add missing files from HDFS-9005. (lei)


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

Branch: refs/heads/branch-2
Commit: ae9831498035c87660bfe54ad954f7dffd2fba58
Parents: 4936486
Author: Lei Xu 
Authored: Fri Mar 25 17:10:31 2016 -0700
Committer: Lei Xu 
Committed: Fri Mar 25 18:13:01 2016 -0700

--
 .../apache/hadoop/hdfs/protocol/DatanodeID.java |   6 +
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |   4 +-
 .../server/blockmanagement/DatanodeManager.java |  59 +---
 .../server/blockmanagement/HostFileManager.java | 147 +--
 .../src/main/resources/hdfs-default.xml |  14 ++
 .../src/site/markdown/HdfsUserGuide.md  |   6 +-
 .../apache/hadoop/hdfs/TestDatanodeReport.java  |  57 ++-
 .../TestBlocksWithNotEnoughRacks.java   |  33 ++---
 .../blockmanagement/TestDatanodeManager.java|   8 +-
 .../blockmanagement/TestHostFileManager.java|  10 +-
 .../hdfs/server/namenode/TestHostsFiles.java|  70 +
 .../server/namenode/TestNameNodeMXBean.java |  25 ++--
 .../hdfs/server/namenode/TestStartup.java   |  53 +--
 13 files changed, 227 insertions(+), 265 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ae983149/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
index 86782f2..e94c07d 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
@@ -23,6 +23,8 @@ import org.apache.hadoop.classification.InterfaceStability;
 
 import com.google.common.annotations.VisibleForTesting;
 
+import java.net.InetSocketAddress;
+
 /**
  * This class represents the primary identifier for a Datanode.
  * Datanodes are identified by how they can be contacted (hostname
@@ -272,4 +274,8 @@ public class DatanodeID implements Comparable {
   public int compareTo(DatanodeID that) {
 return getXferAddr().compareTo(that.getXferAddr());
   }
+
+  public InetSocketAddress getResolvedAddress() {
+return new InetSocketAddress(this.getIpAddr(), this.getXferPort());
+  }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ae983149/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 7aa8c46..8d2ab3d 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
@@ -396,12 +396,12 @@ public class DFSConfigKeys extends 
CommonConfigurationKeys {
   public static final String  DFS_METRICS_PERCENTILES_INTERVALS_KEY = 
"dfs.metrics.percentiles.intervals";
   public static final String  DFS_DATANODE_HOST_NAME_KEY =
   HdfsClientConfigKeys.DeprecatedKeys.DFS_DATANODE_HOST_NAME_KEY;
-  public static final String  DFS_NAMENODE_HOSTS_KEY = "dfs.namenode.hosts";
-  public static final String  DFS_NAMENODE_HOSTS_EXCLUDE_KEY = 
"dfs.namenode.hosts.exclude";
   public static final String  DFS_NAMENODE_CHECKPOINT_DIR_KEY =
   HdfsClientConfigKeys.DeprecatedKeys.DFS_NAMENODE_CHECKPOINT_DIR_KEY;
   public static final String  DFS_NAMENODE_CHECKPOINT_EDITS_DIR_KEY =
   
HdfsClientConfigKeys.DeprecatedKeys.DFS_NAMENODE_CHECKPOINT_EDITS_DIR_KEY;
+  public static final String  DFS_NAMENODE_HOSTS_PROVIDER_CLASSNAME_KEY =
+  "dfs.namenode.hosts.provider.classname";
   public static final String  DFS_HOSTS = "dfs.hosts";
   public static final String  DFS_HOSTS_EXCLUDE = "dfs.hosts.exclude";
   public static final String  DFS_NAMENODE_AUDIT_LOGGERS_KEY = 
"dfs.namenode.audit.loggers";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ae983149/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
--
diff --git

hadoop git commit: Add missing files from HDFS-9005. (lei)

2016-03-25 Thread lei 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 4fcfea71b -> fde8ac5d8


Add missing files from HDFS-9005. (lei)


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

Branch: refs/heads/trunk
Commit: fde8ac5d8514f5146f438f8d0794116aaef20416
Parents: 4fcfea7
Author: Lei Xu 
Authored: Fri Mar 25 17:10:31 2016 -0700
Committer: Lei Xu 
Committed: Fri Mar 25 17:11:35 2016 -0700

--
 .../apache/hadoop/hdfs/protocol/DatanodeID.java |   6 +
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |   4 +-
 .../server/blockmanagement/DatanodeManager.java |  59 +---
 .../server/blockmanagement/HostFileManager.java | 147 +--
 .../src/main/resources/hdfs-default.xml |  14 ++
 .../src/site/markdown/HdfsUserGuide.md  |   6 +-
 .../apache/hadoop/hdfs/TestDatanodeReport.java  |  57 ++-
 .../TestBlocksWithNotEnoughRacks.java   |  34 ++---
 .../blockmanagement/TestDatanodeManager.java|   8 +-
 .../blockmanagement/TestHostFileManager.java|  10 +-
 .../hdfs/server/namenode/TestHostsFiles.java|  70 +
 .../server/namenode/TestNameNodeMXBean.java |  25 ++--
 .../hdfs/server/namenode/TestStartup.java   |  54 +--
 13 files changed, 227 insertions(+), 267 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/fde8ac5d/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
index 5fd845d..af720c7 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
@@ -23,6 +23,8 @@ import org.apache.hadoop.classification.InterfaceStability;
 
 import com.google.common.annotations.VisibleForTesting;
 
+import java.net.InetSocketAddress;
+
 /**
  * This class represents the primary identifier for a Datanode.
  * Datanodes are identified by how they can be contacted (hostname
@@ -274,4 +276,8 @@ public class DatanodeID implements Comparable {
   public int compareTo(DatanodeID that) {
 return getXferAddr().compareTo(that.getXferAddr());
   }
+
+  public InetSocketAddress getResolvedAddress() {
+return new InetSocketAddress(this.getIpAddr(), this.getXferPort());
+  }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fde8ac5d/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 844fec2..9424662 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
@@ -415,12 +415,12 @@ public class DFSConfigKeys extends 
CommonConfigurationKeys {
   public static final String  DFS_METRICS_PERCENTILES_INTERVALS_KEY = 
"dfs.metrics.percentiles.intervals";
   public static final String  DFS_DATANODE_HOST_NAME_KEY =
   HdfsClientConfigKeys.DeprecatedKeys.DFS_DATANODE_HOST_NAME_KEY;
-  public static final String  DFS_NAMENODE_HOSTS_KEY = "dfs.namenode.hosts";
-  public static final String  DFS_NAMENODE_HOSTS_EXCLUDE_KEY = 
"dfs.namenode.hosts.exclude";
   public static final String  DFS_NAMENODE_CHECKPOINT_DIR_KEY =
   HdfsClientConfigKeys.DeprecatedKeys.DFS_NAMENODE_CHECKPOINT_DIR_KEY;
   public static final String  DFS_NAMENODE_CHECKPOINT_EDITS_DIR_KEY =
   
HdfsClientConfigKeys.DeprecatedKeys.DFS_NAMENODE_CHECKPOINT_EDITS_DIR_KEY;
+  public static final String  DFS_NAMENODE_HOSTS_PROVIDER_CLASSNAME_KEY =
+  "dfs.namenode.hosts.provider.classname";
   public static final String  DFS_HOSTS = "dfs.hosts";
   public static final String  DFS_HOSTS_EXCLUDE = "dfs.hosts.exclude";
   public static final String  DFS_NAMENODE_AUDIT_LOGGERS_KEY = 
"dfs.namenode.audit.loggers";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fde8ac5d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
--
diff --git