You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dr...@apache.org on 2016/08/04 12:42:11 UTC
[22/30] hadoop git commit: HDFS-10710. In
BlockManager#rescanPostponedMisreplicatedBlocks(),
postponed misreplicated block counts should be retrieved within the NN lock
protection.Contributed by GAO Rui.
HDFS-10710. In BlockManager#rescanPostponedMisreplicatedBlocks(), postponed misreplicated block counts should be retrieved within the NN lock protection.Contributed by GAO Rui.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f4ba5ff1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f4ba5ff1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f4ba5ff1
Branch: refs/heads/HADOOP-12756
Commit: f4ba5ff1d70ef92d59851c09c4bd4b43d6c04971
Parents: db64654
Author: Jing Zhao <ji...@apache.org>
Authored: Wed Aug 3 11:39:06 2016 -0700
Committer: Jing Zhao <ji...@apache.org>
Committed: Wed Aug 3 12:42:05 2016 -0700
----------------------------------------------------------------------
.../apache/hadoop/hdfs/server/blockmanagement/BlockManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4ba5ff1/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 349b018..6c25d64 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
@@ -2278,9 +2278,9 @@ public class BlockManager implements BlockStatsMXBean {
return;
}
long startTimeRescanPostponedMisReplicatedBlocks = Time.monotonicNow();
+ namesystem.writeLock();
long startPostponedMisReplicatedBlocksCount =
getPostponedMisreplicatedBlocksCount();
- namesystem.writeLock();
try {
// blocksPerRescan is the configured number of blocks per rescan.
// Randomly select blocksPerRescan consecutive blocks from the HashSet
@@ -2333,9 +2333,9 @@ public class BlockManager implements BlockStatsMXBean {
}
}
} finally {
- namesystem.writeUnlock();
long endPostponedMisReplicatedBlocksCount =
getPostponedMisreplicatedBlocksCount();
+ namesystem.writeUnlock();
LOG.info("Rescan of postponedMisreplicatedBlocks completed in " +
(Time.monotonicNow() - startTimeRescanPostponedMisReplicatedBlocks) +
" msecs. " + endPostponedMisReplicatedBlocksCount +
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org