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 vv...@apache.org on 2016/07/25 08:25:23 UTC
[35/50] [abbrv] hadoop git commit: HDFS-10287. MiniDFSCluster should
implement AutoCloseable. Contributed by Andras Bokor.
HDFS-10287. MiniDFSCluster should implement AutoCloseable. Contributed by Andras Bokor.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fcde6940
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fcde6940
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fcde6940
Branch: refs/heads/YARN-4757
Commit: fcde6940e0cbdedb1105007e4857137ecdfa1284
Parents: bd3dcf4
Author: Akira Ajisaka <aa...@apache.org>
Authored: Thu Jul 21 11:25:28 2016 -0700
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Thu Jul 21 11:26:08 2016 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 7 ++-
.../apache/hadoop/hdfs/TestMiniDFSCluster.java | 53 +++++++-------------
2 files changed, 24 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fcde6940/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
index 3b3a88b..3bb3a10 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
@@ -136,7 +136,7 @@ import com.google.common.collect.Sets;
*/
@InterfaceAudience.LimitedPrivate({"HBase", "HDFS", "Hive", "MapReduce", "Pig"})
@InterfaceStability.Unstable
-public class MiniDFSCluster {
+public class MiniDFSCluster implements AutoCloseable {
private static final String NAMESERVICE_ID_PREFIX = "nameserviceId";
private static final Log LOG = LogFactory.getLog(MiniDFSCluster.class);
@@ -3057,4 +3057,9 @@ public class MiniDFSCluster {
writer.close();
}
}
+
+ @Override
+ public void close() {
+ shutdown();
+ }
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fcde6940/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
index ec72d87..4d027dc 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
@@ -64,22 +64,17 @@ public class TestMiniDFSCluster {
public void testClusterWithoutSystemProperties() throws Throwable {
String oldPrp = System.getProperty(MiniDFSCluster.PROP_TEST_BUILD_DATA);
System.clearProperty(MiniDFSCluster.PROP_TEST_BUILD_DATA);
- MiniDFSCluster cluster = null;
- try {
- Configuration conf = new HdfsConfiguration();
- File testDataCluster1 = new File(testDataPath, CLUSTER_1);
- String c1Path = testDataCluster1.getAbsolutePath();
- conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c1Path);
- cluster = new MiniDFSCluster.Builder(conf).build();
+ Configuration conf = new HdfsConfiguration();
+ File testDataCluster1 = new File(testDataPath, CLUSTER_1);
+ String c1Path = testDataCluster1.getAbsolutePath();
+ conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c1Path);
+ try (MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).build()){
assertEquals(new File(c1Path + "/data"),
new File(cluster.getDataDirectory()));
} finally {
if (oldPrp != null) {
System.setProperty(MiniDFSCluster.PROP_TEST_BUILD_DATA, oldPrp);
}
- if (cluster != null) {
- cluster.shutdown();
- }
}
}
@@ -110,15 +105,12 @@ public class TestMiniDFSCluster {
File testDataCluster5 = new File(testDataPath, CLUSTER_5);
String c5Path = testDataCluster5.getAbsolutePath();
conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c5Path);
- MiniDFSCluster cluster5 = new MiniDFSCluster.Builder(conf)
- .numDataNodes(1)
- .checkDataNodeHostConfig(true)
- .build();
- try {
+ try (MiniDFSCluster cluster5 = new MiniDFSCluster.Builder(conf)
+ .numDataNodes(1)
+ .checkDataNodeHostConfig(true)
+ .build()) {
assertEquals("DataNode hostname config not respected", "MYHOST",
cluster5.getDataNodes().get(0).getDatanodeId().getHostName());
- } finally {
- MiniDFSCluster.shutdownCluster(cluster5);
}
}
@@ -128,9 +120,8 @@ public class TestMiniDFSCluster {
StorageType[][] storageType = new StorageType[][] {
{StorageType.DISK, StorageType.ARCHIVE}, {StorageType.DISK},
{StorageType.ARCHIVE}};
- final MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf)
- .numDataNodes(3).storageTypes(storageType).build();
- try {
+ try (MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf)
+ .numDataNodes(3).storageTypes(storageType).build()) {
cluster.waitActive();
ArrayList<DataNode> dataNodes = cluster.getDataNodes();
// Check the number of directory in DN's
@@ -138,17 +129,14 @@ public class TestMiniDFSCluster {
assertEquals(DataNode.getStorageLocations(dataNodes.get(i).getConf())
.size(), storageType[i].length);
}
- } finally {
- MiniDFSCluster.shutdownCluster(cluster);
}
}
@Test
public void testClusterNoStorageTypeSetForDatanodes() throws IOException {
final Configuration conf = new HdfsConfiguration();
- final MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf)
- .numDataNodes(3).build();
- try {
+ try (final MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf)
+ .numDataNodes(3).build()) {
cluster.waitActive();
ArrayList<DataNode> dataNodes = cluster.getDataNodes();
// Check the number of directory in DN's
@@ -156,20 +144,17 @@ public class TestMiniDFSCluster {
assertEquals(DataNode.getStorageLocations(datanode.getConf()).size(),
2);
}
- } finally {
- MiniDFSCluster.shutdownCluster(cluster);
}
}
@Test
public void testSetUpFederatedCluster() throws Exception {
Configuration conf = new Configuration();
- MiniDFSCluster cluster =
- new MiniDFSCluster.Builder(conf).nnTopology(
- MiniDFSNNTopology.simpleHAFederatedTopology(2))
- .numDataNodes(2)
- .build();
- try {
+
+ try (MiniDFSCluster cluster =
+ new MiniDFSCluster.Builder(conf)
+ .nnTopology(MiniDFSNNTopology.simpleHAFederatedTopology(2))
+ .numDataNodes(2).build()) {
cluster.waitActive();
cluster.transitionToActive(1);
cluster.transitionToActive(3);
@@ -201,8 +186,6 @@ public class TestMiniDFSCluster {
DFSUtil.addKeySuffixes(
DFS_NAMENODE_HTTP_ADDRESS_KEY, "ns1", "nn1")));
}
- } finally {
- MiniDFSCluster.shutdownCluster(cluster);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org