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 sh...@apache.org on 2018/10/05 22:07:01 UTC

[32/50] [abbrv] hadoop git commit: HDDS-565. TestContainerPersistence fails regularly in Jenkins. Contributed by Dinesh Chitlangia.

HDDS-565. TestContainerPersistence fails regularly in Jenkins. Contributed by Dinesh Chitlangia.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7fb91b8a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7fb91b8a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7fb91b8a

Branch: refs/heads/HDFS-12943
Commit: 7fb91b8a534eaeda55c2de120a7d23f9c90d265b
Parents: 619e490
Author: Bharat Viswanadham <bh...@apache.org>
Authored: Thu Oct 4 21:26:58 2018 -0700
Committer: Bharat Viswanadham <bh...@apache.org>
Committed: Thu Oct 4 21:27:12 2018 -0700

----------------------------------------------------------------------
 .../ozone/container/common/impl/TestContainerPersistence.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/7fb91b8a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
----------------------------------------------------------------------
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
index b6cdc9d..d9e0d29 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
@@ -74,7 +74,6 @@ import java.util.Map;
 import java.util.UUID;
 
 import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Stage.COMBINED;
-import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_DATA_DIR_KEY;
 import static org.apache.hadoop.ozone.container.ContainerTestHelper.getChunk;
 import static org.apache.hadoop.ozone.container.ContainerTestHelper.getData;
 import static org.apache.hadoop.ozone.container.ContainerTestHelper.setDataChecksum;
@@ -129,7 +128,7 @@ public class TestContainerPersistence {
     blockManager = new BlockManagerImpl(conf);
     chunkManager = new ChunkManagerImpl();
 
-    for (String dir : conf.getStrings(DFS_DATANODE_DATA_DIR_KEY)) {
+    for (String dir : conf.getStrings(ScmConfigKeys.HDDS_DATANODE_DIR_KEY)) {
       StorageLocation location = StorageLocation.parse(dir);
       FileUtils.forceMkdir(new File(location.getNormalizedUri()));
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org