Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-14476. lock too long when fix inconsistent blocks between disk and in-memory. Contributed by Sean Chow.

This commit is contained in:
Wei-Chiu Chuang 2019-08-18 17:51:44 -07:00
parent b020c5ccfd
commit 8755de108d
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
View File

@ -63,6 +63,7 @@ import org.apache.hadoop.util.Time;
public class DirectoryScanner implements Runnable { public class DirectoryScanner implements Runnable {
private static final Log LOG = LogFactory.getLog(DirectoryScanner.class); private static final Log LOG = LogFactory.getLog(DirectoryScanner.class);
private static final int MILLIS_PER_SECOND = 1000; private static final int MILLIS_PER_SECOND = 1000;
private static final int RECONCILE_BLOCKS_BATCH_SIZE = 1000;
private static final String START_MESSAGE = private static final String START_MESSAGE =
"Periodic Directory Tree Verification scan" "Periodic Directory Tree Verification scan"
+ " starting at %s with interval of %dms"; + " starting at %s with interval of %dms";
@ -564,14 +565,27 @@ public class DirectoryScanner implements Runnable {
*/ */
@VisibleForTesting @VisibleForTesting
void reconcile() throws IOException { void reconcile() throws IOException {
LOG.debug("reconcile start DirectoryScanning");
scan(); scan();
for (Entry<String, LinkedList<ScanInfo>> entry : diffs.entrySet()) { for (Entry<String, LinkedList<ScanInfo>> entry : diffs.entrySet()) {
String bpid = entry.getKey(); String bpid = entry.getKey();
LinkedList<ScanInfo> diff = entry.getValue(); LinkedList<ScanInfo> diff = entry.getValue();
// HDFS-14476: run checkAndUpadte with batch to avoid holding the lock too
// long
int loopCount = 0;
for (ScanInfo info : diff) { for (ScanInfo info : diff) {
dataset.checkAndUpdate(bpid, info.getBlockId(), info.getBlockFile(), dataset.checkAndUpdate(bpid, info.getBlockId(), info.getBlockFile(),
info.getMetaFile(), info.getVolume()); info.getMetaFile(), info.getVolume());
if (loopCount % RECONCILE_BLOCKS_BATCH_SIZE == 0) {
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
// do nothing
}
}
loopCount++;
} }
} }
if (!retainDiffs) clear(); if (!retainDiffs) clear();