Author: shv
Date: Wed Sep 16 21:05:06 2009
New Revision: 815964
URL: http://svn.apache.org/viewvc?rev=815964&view=rev
Log:
HDFS-622. checkMinReplication should count live nodes only. Contributed by
Konstantin Shvachko.
Modified:
hadoop/hdfs/trunk/CHANGES.txt
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/BlockManager.java
Modified: hadoop/hdfs/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=815964&r1=815963&r2=815964&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Wed Sep 16 21:05:06 2009
@@ -247,6 +247,8 @@
HDFS-612. Remove the use of org.mortbay.log.Log in FSDataset. (szetszwo)
+ HDFS-622. checkMinReplication should count live nodes only. (shv)
+
Release 0.20.1 - Unreleased
IMPROVEMENTS
Modified:
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/BlockManager.java
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/BlockManager.java?rev=815964&r1=815963&r2=815964&view=diff
==============================================================================
---
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/BlockManager.java
(original)
+++
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/BlockManager.java
Wed Sep 16 21:05:06 2009
@@ -233,7 +233,7 @@
* @return true if the block has minimum replicas
*/
boolean checkMinReplication(Block block) {
- return (blocksMap.numNodes(block) >= minReplication);
+ return (countNodes(block).liveReplicas() >= minReplication);
}
/**
