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 so...@apache.org on 2020/09/22 11:11:06 UTC
[hadoop] branch branch-3.3 updated: HDFS-15415. Reduce locking in
Datanode DirectoryScanner. Contributed by Stephen O'Donnell
This is an automated email from the ASF dual-hosted git repository.
sodonnell pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 5f321df HDFS-15415. Reduce locking in Datanode DirectoryScanner. Contributed by Stephen O'Donnell
5f321df is described below
commit 5f321df0a0dd392be6dcb04d5bcfa4ad4b75bcb1
Author: S O'Donnell <so...@cloudera.com>
AuthorDate: Tue Sep 22 12:00:02 2020 +0100
HDFS-15415. Reduce locking in Datanode DirectoryScanner. Contributed by Stephen O'Donnell
---
.../hdfs/server/datanode/DirectoryScanner.java | 143 ++++++++++-----------
1 file changed, 70 insertions(+), 73 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 bbf12ff..ce084a7 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
@@ -46,7 +46,6 @@ import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.server.datanode.fsdataset.FsDatasetSpi;
import org.apache.hadoop.hdfs.server.datanode.fsdataset.FsVolumeSpi;
import org.apache.hadoop.hdfs.server.datanode.fsdataset.FsVolumeSpi.ScanInfo;
-import org.apache.hadoop.util.AutoCloseableLock;
import org.apache.hadoop.util.Daemon;
import org.apache.hadoop.util.StopWatch;
import org.slf4j.Logger;
@@ -472,87 +471,85 @@ public class DirectoryScanner implements Runnable {
// Pre-sort the reports outside of the lock
blockPoolReport.sortBlocks();
- // Hold FSDataset lock to prevent further changes to the block map
- try (AutoCloseableLock lock = dataset.acquireDatasetLock()) {
- for (final String bpid : blockPoolReport.getBlockPoolIds()) {
- List<ScanInfo> blockpoolReport = blockPoolReport.getScanInfo(bpid);
-
- Stats statsRecord = new Stats(bpid);
- stats.put(bpid, statsRecord);
- Collection<ScanInfo> diffRecord = new ArrayList<>();
-
- statsRecord.totalBlocks = blockpoolReport.size();
- final List<ReplicaInfo> bl = dataset.getSortedFinalizedBlocks(bpid);
-
- int d = 0; // index for blockpoolReport
- int m = 0; // index for memReprot
- while (m < bl.size() && d < blockpoolReport.size()) {
- ReplicaInfo memBlock = bl.get(m);
- ScanInfo info = blockpoolReport.get(d);
- if (info.getBlockId() < memBlock.getBlockId()) {
- if (!dataset.isDeletingBlock(bpid, info.getBlockId())) {
- // Block is missing in memory
- statsRecord.missingMemoryBlocks++;
- addDifference(diffRecord, statsRecord, info);
- }
- d++;
- continue;
- }
- if (info.getBlockId() > memBlock.getBlockId()) {
- // Block is missing on the disk
- addDifference(diffRecord, statsRecord, memBlock.getBlockId(),
- info.getVolume());
- m++;
- continue;
- }
- // Block file and/or metadata file exists on the disk
- // Block exists in memory
- if (info.getVolume().getStorageType() != StorageType.PROVIDED
- && info.getBlockFile() == null) {
- // Block metadata file exits and block file is missing
- addDifference(diffRecord, statsRecord, info);
- } else if (info.getGenStamp() != memBlock.getGenerationStamp()
- || info.getBlockLength() != memBlock.getNumBytes()) {
- // Block metadata file is missing or has wrong generation stamp,
- // or block file length is different than expected
- statsRecord.mismatchBlocks++;
- addDifference(diffRecord, statsRecord, info);
- } else if (memBlock.compareWith(info) != 0) {
- // volumeMap record and on-disk files do not match.
- statsRecord.duplicateBlocks++;
+ for (final String bpid : blockPoolReport.getBlockPoolIds()) {
+ List<ScanInfo> blockpoolReport = blockPoolReport.getScanInfo(bpid);
+
+ Stats statsRecord = new Stats(bpid);
+ stats.put(bpid, statsRecord);
+ Collection<ScanInfo> diffRecord = new ArrayList<>();
+
+ statsRecord.totalBlocks = blockpoolReport.size();
+ final List<ReplicaInfo> bl;
+ bl = dataset.getSortedFinalizedBlocks(bpid);
+
+ int d = 0; // index for blockpoolReport
+ int m = 0; // index for memReprot
+ while (m < bl.size() && d < blockpoolReport.size()) {
+ ReplicaInfo memBlock = bl.get(m);
+ ScanInfo info = blockpoolReport.get(d);
+ if (info.getBlockId() < memBlock.getBlockId()) {
+ if (!dataset.isDeletingBlock(bpid, info.getBlockId())) {
+ // Block is missing in memory
+ statsRecord.missingMemoryBlocks++;
addDifference(diffRecord, statsRecord, info);
}
d++;
-
- if (d < blockpoolReport.size()) {
- // There may be multiple on-disk records for the same block, do not
- // increment the memory record pointer if so.
- ScanInfo nextInfo = blockpoolReport.get(d);
- if (nextInfo.getBlockId() != info.getBlockId()) {
- ++m;
- }
- } else {
- ++m;
- }
+ continue;
}
- while (m < bl.size()) {
- ReplicaInfo current = bl.get(m++);
- addDifference(diffRecord, statsRecord, current.getBlockId(),
- current.getVolume());
+ if (info.getBlockId() > memBlock.getBlockId()) {
+ // Block is missing on the disk
+ addDifference(diffRecord, statsRecord, memBlock.getBlockId(),
+ info.getVolume());
+ m++;
+ continue;
}
- while (d < blockpoolReport.size()) {
- if (!dataset.isDeletingBlock(bpid,
- blockpoolReport.get(d).getBlockId())) {
- statsRecord.missingMemoryBlocks++;
- addDifference(diffRecord, statsRecord, blockpoolReport.get(d));
+ // Block file and/or metadata file exists on the disk
+ // Block exists in memory
+ if (info.getVolume().getStorageType() != StorageType.PROVIDED
+ && info.getBlockFile() == null) {
+ // Block metadata file exits and block file is missing
+ addDifference(diffRecord, statsRecord, info);
+ } else if (info.getGenStamp() != memBlock.getGenerationStamp()
+ || info.getBlockLength() != memBlock.getNumBytes()) {
+ // Block metadata file is missing or has wrong generation stamp,
+ // or block file length is different than expected
+ statsRecord.mismatchBlocks++;
+ addDifference(diffRecord, statsRecord, info);
+ } else if (memBlock.compareWith(info) != 0) {
+ // volumeMap record and on-disk files do not match.
+ statsRecord.duplicateBlocks++;
+ addDifference(diffRecord, statsRecord, info);
+ }
+ d++;
+
+ if (d < blockpoolReport.size()) {
+ // There may be multiple on-disk records for the same block, do not
+ // increment the memory record pointer if so.
+ ScanInfo nextInfo = blockpoolReport.get(d);
+ if (nextInfo.getBlockId() != info.getBlockId()) {
+ ++m;
}
- d++;
+ } else {
+ ++m;
}
- synchronized (diffs) {
- diffs.addAll(bpid, diffRecord);
+ }
+ while (m < bl.size()) {
+ ReplicaInfo current = bl.get(m++);
+ addDifference(diffRecord, statsRecord, current.getBlockId(),
+ current.getVolume());
+ }
+ while (d < blockpoolReport.size()) {
+ if (!dataset.isDeletingBlock(bpid,
+ blockpoolReport.get(d).getBlockId())) {
+ statsRecord.missingMemoryBlocks++;
+ addDifference(diffRecord, statsRecord, blockpoolReport.get(d));
}
- LOG.info("Scan Results: {}", statsRecord);
+ d++;
+ }
+ synchronized (diffs) {
+ diffs.addAll(bpid, diffRecord);
}
+ LOG.info("Scan Results: {}", statsRecord);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org