[09/12] git commit: Revert HDFS-6940.

2014-09-09 Thread jing9 
Revert HDFS-6940.

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

Branch: refs/heads/HDFS-6584
Commit: 05af0ff4be871ddbb4c4cb4f0b5b506ecee36fb8
Parents: 28d99db
Author: Konstantin V Shvachko 
Authored: Tue Sep 9 17:30:10 2014 -0700
Committer: Konstantin V Shvachko 
Committed: Tue Sep 9 17:30:10 2014 -0700

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt |  2 -
 .../server/blockmanagement/BlockManager.java| 23 ++
 .../server/blockmanagement/DatanodeManager.java |  6 +--
 .../server/blockmanagement/HostFileManager.java |  4 --
 .../hdfs/server/namenode/FSNamesystem.java  | 46 +---
 .../hdfs/server/namenode/NameNodeAdapter.java   |  2 +-
 6 files changed, 26 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/05af0ff4/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 978f1b8..4efd1dc 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -449,8 +449,6 @@ Release 2.6.0 - UNRELEASED
 HDFS-6376. Distcp data between two HA clusters requires another 
configuration.
 (Dave Marion and Haohui Mai via jing9)
 
-HDFS-6940. Refactoring to allow ConsensusNode implementation. (shv)
-
 HDFS-6943. Improve NN allocateBlock log to include replicas' datanode IPs.
 (Ming Ma via wheat9)
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/05af0ff4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
index 6176188..8470680 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
@@ -164,7 +164,7 @@ public class BlockManager {
   final BlocksMap blocksMap;
 
   /** Replication thread. */
-  Daemon replicationThread;
+  final Daemon replicationThread = new Daemon(new ReplicationMonitor());
   
   /** Store blocks -> datanodedescriptor(s) map of corrupt replicas */
   final CorruptReplicasMap corruptReplicas = new CorruptReplicasMap();
@@ -263,7 +263,6 @@ public class BlockManager {
 this.namesystem = namesystem;
 datanodeManager = new DatanodeManager(this, namesystem, conf);
 heartbeatManager = datanodeManager.getHeartbeatManager();
-setReplicationMonitor(new ReplicationMonitor());
 
 final long pendingPeriod = conf.getLong(
 DFSConfigKeys.DFS_NAMENODE_STARTUP_DELAY_BLOCK_DELETION_SEC_KEY,
@@ -395,23 +394,7 @@ public class BlockManager {
   lifetimeMin*60*1000L, 0, null, encryptionAlgorithm);
 }
   }
-
-  public long getReplicationRecheckInterval() {
-return replicationRecheckInterval;
-  }
-
-  public AtomicLong excessBlocksCount() {
-return excessBlocksCount;
-  }
-
-  public void clearInvalidateBlocks() {
-invalidateBlocks.clear();
-  }
-
-  void setReplicationMonitor(Runnable replicationMonitor) {
-replicationThread = new Daemon(replicationMonitor);
-  }
-
+  
   public void setBlockPoolId(String blockPoolId) {
 if (isBlockTokenEnabled()) {
   blockTokenSecretManager.setBlockPoolId(blockPoolId);
@@ -1633,7 +1616,7 @@ public class BlockManager {
* If there were any replication requests that timed out, reap them
* and put them back into the neededReplication queue
*/
-  void processPendingReplications() {
+  private void processPendingReplications() {
 Block[] timedOutItems = pendingReplications.getTimedOutBlocks();
 if (timedOutItems != null) {
   namesystem.writeLock();

http://git-wip-us.apache.org/repos/asf/hadoop/blob/05af0ff4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
index 55d616f..709f060 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache

[5/6] git commit: Revert HDFS-6940.

2014-09-09 Thread arp 
Revert HDFS-6940.

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

Branch: refs/heads/HDFS-6581
Commit: 05af0ff4be871ddbb4c4cb4f0b5b506ecee36fb8
Parents: 28d99db
Author: Konstantin V Shvachko 
Authored: Tue Sep 9 17:30:10 2014 -0700
Committer: Konstantin V Shvachko 
Committed: Tue Sep 9 17:30:10 2014 -0700

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt |  2 -
 .../server/blockmanagement/BlockManager.java| 23 ++
 .../server/blockmanagement/DatanodeManager.java |  6 +--
 .../server/blockmanagement/HostFileManager.java |  4 --
 .../hdfs/server/namenode/FSNamesystem.java  | 46 +---
 .../hdfs/server/namenode/NameNodeAdapter.java   |  2 +-
 6 files changed, 26 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/05af0ff4/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 978f1b8..4efd1dc 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -449,8 +449,6 @@ Release 2.6.0 - UNRELEASED
 HDFS-6376. Distcp data between two HA clusters requires another 
configuration.
 (Dave Marion and Haohui Mai via jing9)
 
-HDFS-6940. Refactoring to allow ConsensusNode implementation. (shv)
-
 HDFS-6943. Improve NN allocateBlock log to include replicas' datanode IPs.
 (Ming Ma via wheat9)
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/05af0ff4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
index 6176188..8470680 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
@@ -164,7 +164,7 @@ public class BlockManager {
   final BlocksMap blocksMap;
 
   /** Replication thread. */
-  Daemon replicationThread;
+  final Daemon replicationThread = new Daemon(new ReplicationMonitor());
   
   /** Store blocks -> datanodedescriptor(s) map of corrupt replicas */
   final CorruptReplicasMap corruptReplicas = new CorruptReplicasMap();
@@ -263,7 +263,6 @@ public class BlockManager {
 this.namesystem = namesystem;
 datanodeManager = new DatanodeManager(this, namesystem, conf);
 heartbeatManager = datanodeManager.getHeartbeatManager();
-setReplicationMonitor(new ReplicationMonitor());
 
 final long pendingPeriod = conf.getLong(
 DFSConfigKeys.DFS_NAMENODE_STARTUP_DELAY_BLOCK_DELETION_SEC_KEY,
@@ -395,23 +394,7 @@ public class BlockManager {
   lifetimeMin*60*1000L, 0, null, encryptionAlgorithm);
 }
   }
-
-  public long getReplicationRecheckInterval() {
-return replicationRecheckInterval;
-  }
-
-  public AtomicLong excessBlocksCount() {
-return excessBlocksCount;
-  }
-
-  public void clearInvalidateBlocks() {
-invalidateBlocks.clear();
-  }
-
-  void setReplicationMonitor(Runnable replicationMonitor) {
-replicationThread = new Daemon(replicationMonitor);
-  }
-
+  
   public void setBlockPoolId(String blockPoolId) {
 if (isBlockTokenEnabled()) {
   blockTokenSecretManager.setBlockPoolId(blockPoolId);
@@ -1633,7 +1616,7 @@ public class BlockManager {
* If there were any replication requests that timed out, reap them
* and put them back into the neededReplication queue
*/
-  void processPendingReplications() {
+  private void processPendingReplications() {
 Block[] timedOutItems = pendingReplications.getTimedOutBlocks();
 if (timedOutItems != null) {
   namesystem.writeLock();

http://git-wip-us.apache.org/repos/asf/hadoop/blob/05af0ff4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
index 55d616f..709f060 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache

git commit: Revert HDFS-6940.

2014-09-09 Thread shv 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 fe9d1ee96 -> c1df6f3b4


Revert HDFS-6940.

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

Branch: refs/heads/branch-2
Commit: c1df6f3b4027153a9fa12916bfda50d5e8b996ac
Parents: fe9d1ee
Author: Konstantin V Shvachko 
Authored: Tue Sep 9 17:34:25 2014 -0700
Committer: Konstantin V Shvachko 
Committed: Tue Sep 9 17:34:25 2014 -0700

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt |  2 -
 .../server/blockmanagement/BlockManager.java| 23 ++
 .../server/blockmanagement/DatanodeManager.java |  6 +--
 .../server/blockmanagement/HostFileManager.java |  4 --
 .../hdfs/server/namenode/FSNamesystem.java  | 46 +---
 .../hdfs/server/namenode/NameNodeAdapter.java   |  2 +-
 6 files changed, 26 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c1df6f3b/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 cdb7353..6171a39 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -188,8 +188,6 @@ Release 2.6.0 - UNRELEASED
 HDFS-6376. Distcp data between two HA clusters requires another 
configuration.
 (Dave Marion and Haohui Mai via jing9)
 
-HDFS-6940. Refactoring to allow ConsensusNode implementation. (shv)
-
 HDFS-6943. Improve NN allocateBlock log to include replicas' datanode IPs.
 (Ming Ma via wheat9)
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c1df6f3b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
index de02de1..5d23c1f 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
@@ -164,7 +164,7 @@ public class BlockManager {
   final BlocksMap blocksMap;
 
   /** Replication thread. */
-  Daemon replicationThread;
+  final Daemon replicationThread = new Daemon(new ReplicationMonitor());
   
   /** Store blocks -> datanodedescriptor(s) map of corrupt replicas */
   final CorruptReplicasMap corruptReplicas = new CorruptReplicasMap();
@@ -263,7 +263,6 @@ public class BlockManager {
 this.namesystem = namesystem;
 datanodeManager = new DatanodeManager(this, namesystem, conf);
 heartbeatManager = datanodeManager.getHeartbeatManager();
-setReplicationMonitor(new ReplicationMonitor());
 
 final long pendingPeriod = conf.getLong(
 DFSConfigKeys.DFS_NAMENODE_STARTUP_DELAY_BLOCK_DELETION_SEC_KEY,
@@ -395,23 +394,7 @@ public class BlockManager {
   lifetimeMin*60*1000L, 0, null, encryptionAlgorithm);
 }
   }
-
-  public long getReplicationRecheckInterval() {
-return replicationRecheckInterval;
-  }
-
-  public AtomicLong excessBlocksCount() {
-return excessBlocksCount;
-  }
-
-  public void clearInvalidateBlocks() {
-invalidateBlocks.clear();
-  }
-
-  void setReplicationMonitor(Runnable replicationMonitor) {
-replicationThread = new Daemon(replicationMonitor);
-  }
-
+  
   public void setBlockPoolId(String blockPoolId) {
 if (isBlockTokenEnabled()) {
   blockTokenSecretManager.setBlockPoolId(blockPoolId);
@@ -1636,7 +1619,7 @@ public class BlockManager {
* If there were any replication requests that timed out, reap them
* and put them back into the neededReplication queue
*/
-  void processPendingReplications() {
+  private void processPendingReplications() {
 Block[] timedOutItems = pendingReplications.getTimedOutBlocks();
 if (timedOutItems != null) {
   namesystem.writeLock();

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c1df6f3b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
index dcf6

git commit: Revert HDFS-6940.

2014-09-09 Thread shv 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 28d99db99 -> 05af0ff4b


Revert HDFS-6940.

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

Branch: refs/heads/trunk
Commit: 05af0ff4be871ddbb4c4cb4f0b5b506ecee36fb8
Parents: 28d99db
Author: Konstantin V Shvachko 
Authored: Tue Sep 9 17:30:10 2014 -0700
Committer: Konstantin V Shvachko 
Committed: Tue Sep 9 17:30:10 2014 -0700

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt |  2 -
 .../server/blockmanagement/BlockManager.java| 23 ++
 .../server/blockmanagement/DatanodeManager.java |  6 +--
 .../server/blockmanagement/HostFileManager.java |  4 --
 .../hdfs/server/namenode/FSNamesystem.java  | 46 +---
 .../hdfs/server/namenode/NameNodeAdapter.java   |  2 +-
 6 files changed, 26 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/05af0ff4/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 978f1b8..4efd1dc 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -449,8 +449,6 @@ Release 2.6.0 - UNRELEASED
 HDFS-6376. Distcp data between two HA clusters requires another 
configuration.
 (Dave Marion and Haohui Mai via jing9)
 
-HDFS-6940. Refactoring to allow ConsensusNode implementation. (shv)
-
 HDFS-6943. Improve NN allocateBlock log to include replicas' datanode IPs.
 (Ming Ma via wheat9)
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/05af0ff4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
index 6176188..8470680 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
@@ -164,7 +164,7 @@ public class BlockManager {
   final BlocksMap blocksMap;
 
   /** Replication thread. */
-  Daemon replicationThread;
+  final Daemon replicationThread = new Daemon(new ReplicationMonitor());
   
   /** Store blocks -> datanodedescriptor(s) map of corrupt replicas */
   final CorruptReplicasMap corruptReplicas = new CorruptReplicasMap();
@@ -263,7 +263,6 @@ public class BlockManager {
 this.namesystem = namesystem;
 datanodeManager = new DatanodeManager(this, namesystem, conf);
 heartbeatManager = datanodeManager.getHeartbeatManager();
-setReplicationMonitor(new ReplicationMonitor());
 
 final long pendingPeriod = conf.getLong(
 DFSConfigKeys.DFS_NAMENODE_STARTUP_DELAY_BLOCK_DELETION_SEC_KEY,
@@ -395,23 +394,7 @@ public class BlockManager {
   lifetimeMin*60*1000L, 0, null, encryptionAlgorithm);
 }
   }
-
-  public long getReplicationRecheckInterval() {
-return replicationRecheckInterval;
-  }
-
-  public AtomicLong excessBlocksCount() {
-return excessBlocksCount;
-  }
-
-  public void clearInvalidateBlocks() {
-invalidateBlocks.clear();
-  }
-
-  void setReplicationMonitor(Runnable replicationMonitor) {
-replicationThread = new Daemon(replicationMonitor);
-  }
-
+  
   public void setBlockPoolId(String blockPoolId) {
 if (isBlockTokenEnabled()) {
   blockTokenSecretManager.setBlockPoolId(blockPoolId);
@@ -1633,7 +1616,7 @@ public class BlockManager {
* If there were any replication requests that timed out, reap them
* and put them back into the neededReplication queue
*/
-  void processPendingReplications() {
+  private void processPendingReplications() {
 Block[] timedOutItems = pendingReplications.getTimedOutBlocks();
 if (timedOutItems != null) {
   namesystem.writeLock();

http://git-wip-us.apache.org/repos/asf/hadoop/blob/05af0ff4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
index 55d616f..7