HDFS-6783. Addendum patch to fix test failures. (Contributed by Yi Liu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618635 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
519c4be95a
commit
1c77c80410
|
@ -286,6 +286,7 @@ public class CacheReplicationMonitor extends Thread implements Closeable {
|
||||||
private void rescan() throws InterruptedException {
|
private void rescan() throws InterruptedException {
|
||||||
scannedDirectives = 0;
|
scannedDirectives = 0;
|
||||||
scannedBlocks = 0;
|
scannedBlocks = 0;
|
||||||
|
try {
|
||||||
namesystem.writeLock();
|
namesystem.writeLock();
|
||||||
try {
|
try {
|
||||||
lock.lock();
|
lock.lock();
|
||||||
|
@ -294,11 +295,10 @@ public class CacheReplicationMonitor extends Thread implements Closeable {
|
||||||
"shut down.");
|
"shut down.");
|
||||||
}
|
}
|
||||||
curScanCount = completedScanCount + 1;
|
curScanCount = completedScanCount + 1;
|
||||||
}
|
} finally {
|
||||||
finally {
|
|
||||||
lock.unlock();
|
lock.unlock();
|
||||||
}
|
}
|
||||||
try {
|
|
||||||
resetStatistics();
|
resetStatistics();
|
||||||
rescanCacheDirectives();
|
rescanCacheDirectives();
|
||||||
rescanCachedBlockMap();
|
rescanCachedBlockMap();
|
||||||
|
|
Loading…
Reference in New Issue