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 ta...@apache.org on 2022/04/13 02:27:55 UTC
[hadoop] branch trunk updated: HDFS-16484. [SPS]: Fix an infinite loop bug in SPSPathIdProcessor thread (#4032)
This is an automated email from the ASF dual-hosted git repository.
tasanuma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 45394433a11 HDFS-16484. [SPS]: Fix an infinite loop bug in SPSPathIdProcessor thread (#4032)
45394433a11 is described below
commit 45394433a112334e48087bd60674538af739922a
Author: qinyuren <14...@qq.com>
AuthorDate: Wed Apr 13 10:27:37 2022 +0800
HDFS-16484. [SPS]: Fix an infinite loop bug in SPSPathIdProcessor thread (#4032)
---
.../namenode/sps/BlockStorageMovementNeeded.java | 16 ++++++-
.../sps/TestExternalStoragePolicySatisfier.java | 53 ++++++++++++++++++++++
2 files changed, 68 insertions(+), 1 deletion(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/sps/BlockStorageMovementNeeded.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/sps/BlockStorageMovementNeeded.java
index 9a1faed9525..b6fc15d2104 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/sps/BlockStorageMovementNeeded.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/sps/BlockStorageMovementNeeded.java
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.namenode.sps;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.HashMap;
import java.util.LinkedList;
@@ -227,15 +228,18 @@ public class BlockStorageMovementNeeded {
* ID's to process for satisfy the policy.
*/
private class SPSPathIdProcessor implements Runnable {
+ private static final int MAX_RETRY_COUNT = 3;
@Override
public void run() {
LOG.info("Starting SPSPathIdProcessor!.");
Long startINode = null;
+ int retryCount = 0;
while (ctxt.isRunning()) {
try {
if (!ctxt.isInSafeMode()) {
if (startINode == null) {
+ retryCount = 0;
startINode = ctxt.getNextSPSPath();
} // else same id will be retried
if (startINode == null) {
@@ -248,7 +252,12 @@ public class BlockStorageMovementNeeded {
pendingWorkForDirectory.get(startINode);
if (dirPendingWorkInfo != null
&& dirPendingWorkInfo.isDirWorkDone()) {
- ctxt.removeSPSHint(startINode);
+ try {
+ ctxt.removeSPSHint(startINode);
+ } catch (FileNotFoundException e) {
+ // ignore if the file doesn't already exist
+ startINode = null;
+ }
pendingWorkForDirectory.remove(startINode);
}
}
@@ -268,6 +277,11 @@ public class BlockStorageMovementNeeded {
LOG.info("Interrupted while waiting in SPSPathIdProcessor", t);
break;
}
+ retryCount++;
+ if (retryCount >= MAX_RETRY_COUNT) {
+ LOG.warn("Skipping this inode {} due to too many retries.", startINode);
+ startINode = null;
+ }
}
}
}
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/sps/TestExternalStoragePolicySatisfier.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/sps/TestExternalStoragePolicySatisfier.java
index 9b4dc437ce4..2559836a0a1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/sps/TestExternalStoragePolicySatisfier.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/sps/TestExternalStoragePolicySatisfier.java
@@ -201,6 +201,20 @@ public class TestExternalStoragePolicySatisfier {
}
}
+ private void stopExternalSps() {
+ if (externalSps != null) {
+ externalSps.stopGracefully();
+ }
+ }
+
+ private void startExternalSps() {
+ externalSps = new StoragePolicySatisfier(getConf());
+ externalCtxt = new ExternalSPSContext(externalSps, nnc);
+
+ externalSps.init(externalCtxt);
+ externalSps.start(StoragePolicySatisfierMode.EXTERNAL);
+ }
+
private void createCluster() throws IOException {
getConf().setLong("dfs.block.size", DEFAULT_BLOCK_SIZE);
setCluster(startCluster(getConf(), allDiskTypes, NUM_OF_DATANODES,
@@ -1445,6 +1459,45 @@ public class TestExternalStoragePolicySatisfier {
}
}
+ /**
+ * Test SPS that satisfy the files and then delete the files before start SPS.
+ */
+ @Test(timeout = 300000)
+ public void testSPSSatisfyAndThenDeleteFileBeforeStartSPS() throws Exception {
+ try {
+ createCluster();
+ HdfsAdmin hdfsAdmin =
+ new HdfsAdmin(FileSystem.getDefaultUri(config), config);
+
+ StorageType[][] newtypes =
+ new StorageType[][]{{StorageType.DISK, StorageType.ARCHIVE},
+ {StorageType.DISK, StorageType.ARCHIVE},
+ {StorageType.DISK, StorageType.ARCHIVE}};
+ startAdditionalDNs(config, 3, NUM_OF_DATANODES, newtypes,
+ STORAGES_PER_DATANODE, CAPACITY, hdfsCluster);
+
+ stopExternalSps();
+
+ dfs.setStoragePolicy(new Path(FILE), COLD);
+ hdfsAdmin.satisfyStoragePolicy(new Path(FILE));
+ dfs.delete(new Path(FILE), true);
+
+ startExternalSps();
+
+ String file1 = "/testMoveToSatisfyStoragePolicy_1";
+ writeContent(file1);
+ dfs.setStoragePolicy(new Path(file1), COLD);
+ hdfsAdmin.satisfyStoragePolicy(new Path(file1));
+
+ hdfsCluster.triggerHeartbeats();
+ DFSTestUtil.waitExpectedStorageType(file1, StorageType.ARCHIVE, 3, 30000,
+ dfs);
+ } finally {
+ shutdownCluster();
+ }
+ }
+
+
/**
* Test SPS for directory which has multilevel directories.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org