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 ae...@apache.org on 2017/04/04 17:13:41 UTC
hadoop git commit: HDFS-11620. Ozone: Allocate container for
MiniOzone cluster fails because of insufficient space error. Contributed by
Mukul Kumar Singh.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-7240 3bc2e1d99 -> 38dddad74
HDFS-11620. Ozone: Allocate container for MiniOzone cluster fails because of insufficient space error. Contributed by Mukul Kumar Singh.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/38dddad7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/38dddad7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/38dddad7
Branch: refs/heads/HDFS-7240
Commit: 38dddad74e68ac1f2a6c78026d0d48deb9932bef
Parents: 3bc2e1d
Author: Anu Engineer <ae...@apache.org>
Authored: Tue Apr 4 10:09:40 2017 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Tue Apr 4 10:09:40 2017 -0700
----------------------------------------------------------------------
.../scm/container/placement/algorithms/SCMCommonPolicy.java | 5 +++--
.../src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/38dddad7/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/container/placement/algorithms/SCMCommonPolicy.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/container/placement/algorithms/SCMCommonPolicy.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/container/placement/algorithms/SCMCommonPolicy.java
index 5078111..36712ef 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/container/placement/algorithms/SCMCommonPolicy.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/container/placement/algorithms/SCMCommonPolicy.java
@@ -125,8 +125,9 @@ public abstract class SCMCommonPolicy implements ContainerPlacementPolicy {
if (healthyList.size() < nodesRequired) {
msg = String.format("Unable to find enough nodes that meet the space " +
- "requirement in healthy node set. Nodes required: %d Found: %d",
- nodesRequired, healthyList.size());
+ "requirement of %d bytes in healthy node set." +
+ " Nodes required: %d Found: %d",
+ sizeRequired, nodesRequired, healthyList.size());
LOG.error(msg);
throw new SCMException(msg,
SCMException.ResultCodes.FAILED_TO_FIND_NODES_WITH_SPACE);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/38dddad7/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
index 0a5120e..64f4bb2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
@@ -354,6 +354,7 @@ public final class MiniOzoneCluster extends MiniDFSCluster
if (waitForChillModeFinish) {
cluster.waitTobeOutOfChillMode();
}
+ cluster.waitForHeartbeatProcessed();
} catch (Exception e) {
// A workaround to propagate MiniOzoneCluster failures without
// changing the method signature (which would require cascading
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org