HDFS-13551. TestMiniDFSCluster#testClusterSetStorageCapacity does not shut down cluster. Contributed by Anbang Hu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/92ebd466 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/92ebd466 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/92ebd466 Branch: refs/heads/HDDS-4 Commit: 92ebd466c75275118107e6ec665cf50e337a29e7 Parents: 07d8505 Author: Inigo Goiri <inigo...@apache.org> Authored: Tue May 15 10:21:42 2018 -0700 Committer: Inigo Goiri <inigo...@apache.org> Committed: Tue May 15 10:21:42 2018 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hdfs/TestMiniDFSCluster.java | 44 +++++++++++--------- 1 file changed, 25 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/92ebd466/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 afc977f..d60e025 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 @@ -108,29 +108,35 @@ public class TestMiniDFSCluster { capacities, defaultBlockSize, fileLen); - verifyStorageCapacity(cluster, capacities); + try { + verifyStorageCapacity(cluster, capacities); - /* restart all data nodes */ - cluster.restartDataNodes(); - cluster.waitActive(); - verifyStorageCapacity(cluster, capacities); + /* restart all data nodes */ + cluster.restartDataNodes(); + cluster.waitActive(); + verifyStorageCapacity(cluster, capacities); - /* restart all name nodes */ - cluster.restartNameNodes(); - cluster.waitActive(); - verifyStorageCapacity(cluster, capacities); + /* restart all name nodes */ + cluster.restartNameNodes(); + cluster.waitActive(); + verifyStorageCapacity(cluster, capacities); - /* restart all name nodes firstly and data nodes then */ - cluster.restartNameNodes(); - cluster.restartDataNodes(); - cluster.waitActive(); - verifyStorageCapacity(cluster, capacities); + /* restart all name nodes firstly and data nodes then */ + cluster.restartNameNodes(); + cluster.restartDataNodes(); + cluster.waitActive(); + verifyStorageCapacity(cluster, capacities); - /* restart all data nodes firstly and name nodes then */ - cluster.restartDataNodes(); - cluster.restartNameNodes(); - cluster.waitActive(); - verifyStorageCapacity(cluster, capacities); + /* restart all data nodes firstly and name nodes then */ + cluster.restartDataNodes(); + cluster.restartNameNodes(); + cluster.waitActive(); + verifyStorageCapacity(cluster, capacities); + } finally { + if (cluster != null) { + cluster.shutdown(); + } + } } private void verifyStorageCapacity( --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
