From bebf03a66eb0ebfb95189c8dcede985da1ecb712 Mon Sep 17 00:00:00 2001 From: Steve Vaughan Date: Tue, 14 Jun 2022 02:42:18 -0400 Subject: [PATCH] HDFS-16625. Check assumption about PMDK availability (#4414) Signed-off-by: Ashutosh Gupta Signed-off-by: stack --- .../fsdataset/impl/TestCacheByPmemMappableBlockLoader.java | 3 +++ .../server/datanode/fsdataset/impl/TestPmemCacheRecovery.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestCacheByPmemMappableBlockLoader.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestCacheByPmemMappableBlockLoader.java index 95750289449..baea8f5de2b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestCacheByPmemMappableBlockLoader.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestCacheByPmemMappableBlockLoader.java @@ -66,6 +66,7 @@ import java.util.function.Supplier; import org.apache.hadoop.thirdparty.com.google.common.primitives.Ints; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_FSDATASETCACHE_MAX_THREADS_PER_VOLUME_KEY; +import static org.junit.Assume.assumeTrue; /** * Tests HDFS persistent memory cache by PmemMappableBlockLoader. @@ -104,6 +105,8 @@ public class TestCacheByPmemMappableBlockLoader { @BeforeClass public static void setUpClass() throws Exception { + assumeTrue("Requires PMDK", NativeIO.POSIX.isPmdkAvailable()); + oldInjector = DataNodeFaultInjector.get(); DataNodeFaultInjector.set(new DataNodeFaultInjector() { @Override diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestPmemCacheRecovery.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestPmemCacheRecovery.java index d3232c83629..6ce420adeb1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestPmemCacheRecovery.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestPmemCacheRecovery.java @@ -27,6 +27,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.junit.Assume.assumeTrue; import java.io.File; import java.io.IOException; @@ -103,6 +104,8 @@ public class TestPmemCacheRecovery { @BeforeClass public static void setUpClass() throws Exception { + assumeTrue("Requires PMDK", NativeIO.POSIX.isPmdkAvailable()); + oldInjector = DataNodeFaultInjector.get(); DataNodeFaultInjector.set(new DataNodeFaultInjector() { @Override