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

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

This reverts commit 8b802d6b44.
This commit is contained in:
Wei-Chiu Chuang 2019-08-21 09:00:23 -07:00
parent 6980f1740f
commit 933ea6aa4d
1 changed files with 0 additions and 14 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

@ -68,7 +68,6 @@ public class DirectoryScanner implements Runnable {
+ " starting at %s with interval of %dms"; + " starting at %s with interval of %dms";
private static final String START_MESSAGE_WITH_THROTTLE = START_MESSAGE private static final String START_MESSAGE_WITH_THROTTLE = START_MESSAGE
+ " and throttle limit of %dms/s"; + " and throttle limit of %dms/s";
private static final int RECONCILE_BLOCKS_BATCH_SIZE = 1000;
private final FsDatasetSpi<?> dataset; private final FsDatasetSpi<?> dataset;
private final ExecutorService reportCompileThreadPool; private final ExecutorService reportCompileThreadPool;
@ -374,11 +373,7 @@ public class DirectoryScanner implements Runnable {
*/ */
@VisibleForTesting @VisibleForTesting
public void reconcile() throws IOException { public void reconcile() throws IOException {
LOG.debug("reconcile start DirectoryScanning");
scan(); scan();
// HDFS-14476: run checkAndUpadte with batch to avoid holding the lock too
// long
int loopCount = 0;
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();
@ -386,15 +381,6 @@ public class DirectoryScanner implements Runnable {
for (ScanInfo info : diff) { for (ScanInfo info : diff) {
dataset.checkAndUpdate(bpid, info); dataset.checkAndUpdate(bpid, info);
} }
if (loopCount % RECONCILE_BLOCKS_BATCH_SIZE == 0) {
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
// do nothing
}
}
loopCount++;
} }
if (!retainDiffs) clear(); if (!retainDiffs) clear();
} }