From b262b9a013871d0788b0f9c9109c8edf106905ee Mon Sep 17 00:00:00 2001 From: stack Date: Tue, 21 Apr 2020 09:41:24 -0700 Subject: [PATCH] HBASE-24175 [Flakey Tests] TestSecureExportSnapshot FileNotFoundException Addendum #3; catch more '/tmp' references by hadoop. --- .../hadoop/hbase/HBaseTestingUtility.java | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java index 14040d99344..5c44c56125a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java @@ -729,26 +729,20 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility { new Path(root, "mapreduce-am-staging-root-dir").toString()); // Frustrate yarn's and hdfs's attempts at writing /tmp. - String property = "yarn.node-labels.fs-store.root-dir"; - createDirAndSetProperty(property, property); - property = "yarn.nodemanager.log-dirs"; - createDirAndSetProperty(property, property); - property = "yarn.nodemanager.remote-app-log-dir"; - createDirAndSetProperty(property, property); - property = "yarn.timeline-service.entity-group-fs-store.active-dir"; - createDirAndSetProperty(property, property); - property = "yarn.timeline-service.entity-group-fs-store.done-dir"; - createDirAndSetProperty(property, property); - property = "yarn.nodemanager.remote-app-log-dir"; - createDirAndSetProperty(property, property); - property = "dfs.journalnode.edits.dir"; - createDirAndSetProperty(property, property); - property = "dfs.datanode.shared.file.descriptor.paths"; - createDirAndSetProperty(property, property); - property = "nfs.dump.dir"; - createDirAndSetProperty(property, property); - property = "java.io.tmpdir"; - createDirAndSetProperty(property, property); + // Below is fragile. Make it so we just interpolate any 'tmp' reference. + createDirAndSetProperty("yarn.node-labels.fs-store.root-dir"); + createDirAndSetProperty("yarn.nodemanager.log-dirs"); + createDirAndSetProperty("yarn.nodemanager.remote-app-log-dir"); + createDirAndSetProperty("yarn.timeline-service.entity-group-fs-store.active-dir"); + createDirAndSetProperty("yarn.timeline-service.entity-group-fs-store.done-dir"); + createDirAndSetProperty("yarn.nodemanager.remote-app-log-dir"); + createDirAndSetProperty("dfs.journalnode.edits.dir"); + createDirAndSetProperty("dfs.datanode.shared.file.descriptor.paths"); + createDirAndSetProperty("nfs.dump.dir"); + createDirAndSetProperty("java.io.tmpdir"); + createDirAndSetProperty("java.io.tmpdir"); + createDirAndSetProperty("dfs.journalnode.edits.dir"); + createDirAndSetProperty("dfs.provided.aliasmap.inmemory.leveldb.dir"); } /** @@ -797,6 +791,10 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility { } } + private String createDirAndSetProperty(String relPath, String property) { + return createDirAndSetProperty(property, property); + } + private String createDirAndSetProperty(final String relPath, String property) { String path = getDataTestDir(relPath).toString(); System.setProperty(property, path);