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 in...@apache.org on 2018/05/15 17:24:15 UTC
[1/5] hadoop git commit: HDFS-13551.
TestMiniDFSCluster#testClusterSetStorageCapacity does not shut down cluster.
Contributed by Anbang Hu.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 e28af8b0e -> 4ae1ed5b1
refs/heads/branch-2.9 b4e227286 -> 9cae348dc
refs/heads/branch-3.0 c48dce09a -> 9a722150c
refs/heads/branch-3.1 a0cb1e094 -> 583b9b418
refs/heads/trunk 07d8505f7 -> 92ebd466c
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/trunk
Commit: 92ebd466c75275118107e6ec665cf50e337a29e7
Parents: 07d8505
Author: Inigo Goiri <in...@apache.org>
Authored: Tue May 15 10:21:42 2018 -0700
Committer: Inigo Goiri <in...@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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/5] hadoop git commit: HDFS-13551.
TestMiniDFSCluster#testClusterSetStorageCapacity does not shut down cluster.
Contributed by Anbang Hu.
Posted by in...@apache.org.
HDFS-13551. TestMiniDFSCluster#testClusterSetStorageCapacity does not shut down cluster. Contributed by Anbang Hu.
(cherry picked from commit 92ebd466c75275118107e6ec665cf50e337a29e7)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/583b9b41
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/583b9b41
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/583b9b41
Branch: refs/heads/branch-3.1
Commit: 583b9b418a84f3a80fa956f4ada9f90fc7f5d943
Parents: a0cb1e0
Author: Inigo Goiri <in...@apache.org>
Authored: Tue May 15 10:21:42 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Tue May 15 10:22:19 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/583b9b41/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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[5/5] hadoop git commit: HDFS-13551.
TestMiniDFSCluster#testClusterSetStorageCapacity does not shut down cluster.
Contributed by Anbang Hu.
Posted by in...@apache.org.
HDFS-13551. TestMiniDFSCluster#testClusterSetStorageCapacity does not shut down cluster. Contributed by Anbang Hu.
(cherry picked from commit 92ebd466c75275118107e6ec665cf50e337a29e7)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9cae348d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9cae348d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9cae348d
Branch: refs/heads/branch-2.9
Commit: 9cae348dc567d8808d3d43de0dbd1f2fe68e124b
Parents: b4e2272
Author: Inigo Goiri <in...@apache.org>
Authored: Tue May 15 10:21:42 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Tue May 15 10:23:47 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/9cae348d/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 296ede3..42582ea 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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[4/5] hadoop git commit: HDFS-13551.
TestMiniDFSCluster#testClusterSetStorageCapacity does not shut down cluster.
Contributed by Anbang Hu.
Posted by in...@apache.org.
HDFS-13551. TestMiniDFSCluster#testClusterSetStorageCapacity does not shut down cluster. Contributed by Anbang Hu.
(cherry picked from commit 92ebd466c75275118107e6ec665cf50e337a29e7)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4ae1ed5b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4ae1ed5b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4ae1ed5b
Branch: refs/heads/branch-2
Commit: 4ae1ed5b17686b6c2e25eaa16719013f5949c0d8
Parents: e28af8b
Author: Inigo Goiri <in...@apache.org>
Authored: Tue May 15 10:21:42 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Tue May 15 10:23:28 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/4ae1ed5b/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 296ede3..42582ea 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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[3/5] hadoop git commit: HDFS-13551.
TestMiniDFSCluster#testClusterSetStorageCapacity does not shut down cluster.
Contributed by Anbang Hu.
Posted by in...@apache.org.
HDFS-13551. TestMiniDFSCluster#testClusterSetStorageCapacity does not shut down cluster. Contributed by Anbang Hu.
(cherry picked from commit 92ebd466c75275118107e6ec665cf50e337a29e7)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9a722150
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9a722150
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9a722150
Branch: refs/heads/branch-3.0
Commit: 9a722150c6a5206aa2ddfe978f813f86800b9ed6
Parents: c48dce0
Author: Inigo Goiri <in...@apache.org>
Authored: Tue May 15 10:21:42 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Tue May 15 10:22:52 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/9a722150/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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org