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 cn...@apache.org on 2016/02/06 00:43:04 UTC
[1/3] hadoop git commit: HDFS-9761. Rebalancer sleeps too long
between iterations. Contributed by Mingliang Liu.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 5752df236 -> a7232f5e1
refs/heads/branch-2.8 e01d8393b -> bad8006da
refs/heads/trunk a37e423e8 -> c6497949e
HDFS-9761. Rebalancer sleeps too long between iterations. Contributed by Mingliang Liu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c6497949
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c6497949
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c6497949
Branch: refs/heads/trunk
Commit: c6497949e866594050153b953a85c0a1db59d2f8
Parents: a37e423
Author: cnauroth <cn...@apache.org>
Authored: Fri Feb 5 15:07:43 2016 -0800
Committer: cnauroth <cn...@apache.org>
Committed: Fri Feb 5 15:07:43 2016 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/hdfs/server/balancer/Balancer.java | 7 +++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6497949/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 44cbcc5..80be323 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -2704,6 +2704,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9601. NNThroughputBenchmark.BlockReportStats should handle
NotReplicatedYetException on adding block (iwasakims)
+ HDFS-9761. Rebalancer sleeps too long between iterations
+ (Mingliang Liu via cnauroth)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6497949/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
index 2bd28ab..927fb7f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
@@ -674,14 +674,13 @@ public class Balancer {
// must be an error statue, return.
return r.exitStatus.getExitCode();
}
-
- if (!done) {
- Thread.sleep(sleeptime);
- }
} else {
LOG.info("Skipping blockpool " + nnc.getBlockpoolID());
}
}
+ if (!done) {
+ Thread.sleep(sleeptime);
+ }
}
} finally {
for(NameNodeConnector nnc : connectors) {
[3/3] hadoop git commit: HDFS-9761. Rebalancer sleeps too long
between iterations. Contributed by Mingliang Liu.
Posted by cn...@apache.org.
HDFS-9761. Rebalancer sleeps too long between iterations. Contributed by Mingliang Liu.
(cherry picked from commit c6497949e866594050153b953a85c0a1db59d2f8)
(cherry picked from commit a7232f5e1d20faf210f3718c551cbae4edb5933c)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bad8006d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bad8006d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bad8006d
Branch: refs/heads/branch-2.8
Commit: bad8006da1a544560ad564465d7fa8e4dd1f8311
Parents: e01d839
Author: cnauroth <cn...@apache.org>
Authored: Fri Feb 5 15:07:43 2016 -0800
Committer: cnauroth <cn...@apache.org>
Committed: Fri Feb 5 15:08:07 2016 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/hdfs/server/balancer/Balancer.java | 7 +++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bad8006d/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 0e1ae4b..ccd8321 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1721,6 +1721,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9601. NNThroughputBenchmark.BlockReportStats should handle
NotReplicatedYetException on adding block (iwasakims)
+ HDFS-9761. Rebalancer sleeps too long between iterations
+ (Mingliang Liu via cnauroth)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bad8006d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
index dcae922..8be62ac 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
@@ -673,14 +673,13 @@ public class Balancer {
// must be an error statue, return.
return r.exitStatus.getExitCode();
}
-
- if (!done) {
- Thread.sleep(sleeptime);
- }
} else {
LOG.info("Skipping blockpool " + nnc.getBlockpoolID());
}
}
+ if (!done) {
+ Thread.sleep(sleeptime);
+ }
}
} finally {
for(NameNodeConnector nnc : connectors) {
[2/3] hadoop git commit: HDFS-9761. Rebalancer sleeps too long
between iterations. Contributed by Mingliang Liu.
Posted by cn...@apache.org.
HDFS-9761. Rebalancer sleeps too long between iterations. Contributed by Mingliang Liu.
(cherry picked from commit c6497949e866594050153b953a85c0a1db59d2f8)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a7232f5e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a7232f5e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a7232f5e
Branch: refs/heads/branch-2
Commit: a7232f5e1d20faf210f3718c551cbae4edb5933c
Parents: 5752df2
Author: cnauroth <cn...@apache.org>
Authored: Fri Feb 5 15:07:43 2016 -0800
Committer: cnauroth <cn...@apache.org>
Committed: Fri Feb 5 15:07:59 2016 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/hdfs/server/balancer/Balancer.java | 7 +++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a7232f5e/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index e7563f2..21e90d8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1797,6 +1797,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9601. NNThroughputBenchmark.BlockReportStats should handle
NotReplicatedYetException on adding block (iwasakims)
+ HDFS-9761. Rebalancer sleeps too long between iterations
+ (Mingliang Liu via cnauroth)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a7232f5e/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
index dcae922..8be62ac 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
@@ -673,14 +673,13 @@ public class Balancer {
// must be an error statue, return.
return r.exitStatus.getExitCode();
}
-
- if (!done) {
- Thread.sleep(sleeptime);
- }
} else {
LOG.info("Skipping blockpool " + nnc.getBlockpoolID());
}
}
+ if (!done) {
+ Thread.sleep(sleeptime);
+ }
}
} finally {
for(NameNodeConnector nnc : connectors) {