This is an automated email from the ASF dual-hosted git repository. weichiu pushed a commit to branch branch-3.1 in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 2ce0914176596378575c340e9c30db80953ed033 Author: Wei-Chiu Chuang <[email protected]> AuthorDate: Wed Aug 21 09:00:59 2019 -0700 Revert "HDFS-14476. lock too long when fix inconsistent blocks between disk and in-memory. Contributed by Sean Chow." This reverts commit e978c6c9ed83301fcf8359c35e74ed68045c1a61. --- .../hadoop/hdfs/server/datanode/DirectoryScanner.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java index 5a2f7c2..ab9743c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java @@ -67,7 +67,6 @@ public class DirectoryScanner implements Runnable { + " starting at %s with interval of %dms"; private static final String START_MESSAGE_WITH_THROTTLE = START_MESSAGE + " and throttle limit of %dms/s"; - private static final int RECONCILE_BLOCKS_BATCH_SIZE = 1000; private final FsDatasetSpi<?> dataset; private final ExecutorService reportCompileThreadPool; @@ -373,11 +372,7 @@ public class DirectoryScanner implements Runnable { */ @VisibleForTesting public void reconcile() throws IOException { - LOG.debug("reconcile start DirectoryScanning"); 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()) { String bpid = entry.getKey(); LinkedList<ScanInfo> diff = entry.getValue(); @@ -385,15 +380,6 @@ public class DirectoryScanner implements Runnable { for (ScanInfo info : diff) { dataset.checkAndUpdate(bpid, info); } - - if (loopCount % RECONCILE_BLOCKS_BATCH_SIZE == 0) { - try { - Thread.sleep(2000); - } catch (InterruptedException e) { - // do nothing - } - } - loopCount++; } if (!retainDiffs) clear(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
