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 2015/01/19 20:35:07 UTC
[1/2] hadoop git commit: HADOOP-10668.
TestZKFailoverControllerStress#testExpireBackAndForth occasionally fails.
Contributed by Ming Ma.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 5da33c5b5 -> a70e2c15b
refs/heads/trunk e843a0a8c -> 7fc1f2f5c
HADOOP-10668. TestZKFailoverControllerStress#testExpireBackAndForth occasionally fails. Contributed by Ming Ma.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7fc1f2f5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7fc1f2f5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7fc1f2f5
Branch: refs/heads/trunk
Commit: 7fc1f2f5cf4312d72aeffb1a9cef497d00c60adb
Parents: e843a0a
Author: cnauroth <cn...@apache.org>
Authored: Mon Jan 19 11:28:30 2015 -0800
Committer: cnauroth <cn...@apache.org>
Committed: Mon Jan 19 11:28:30 2015 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/ha/ZKFailoverController.java | 4 +++-
.../src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java | 4 ++--
3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7fc1f2f5/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index d9e6180..9e1bf59 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -722,6 +722,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-10542 Potential null pointer dereference in Jets3tFileSystemStore
retrieveBlock(). (Ted Yu via stevel)
+ HADOOP-10668. TestZKFailoverControllerStress#testExpireBackAndForth
+ occasionally fails. (Ming Ma via cnauroth)
+
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7fc1f2f5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
index 46c485b..f58c3f4 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
@@ -153,7 +153,9 @@ public abstract class ZKFailoverController {
public HAServiceTarget getLocalTarget() {
return localTarget;
}
-
+
+ HAServiceState getServiceState() { return serviceState; }
+
public int run(final String[] args) throws Exception {
if (!localTarget.isAutoFailoverEnabled()) {
LOG.fatal("Automatic failover is not enabled for " + localTarget + "." +
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7fc1f2f5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java
index 1db7924..cab59a4 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java
@@ -158,8 +158,8 @@ public class MiniZKFCCluster {
*/
public void waitForHAState(int idx, HAServiceState state)
throws Exception {
- DummyHAService svc = getService(idx);
- while (svc.state != state) {
+ DummyZKFC svc = getZkfc(idx);
+ while (svc.getServiceState() != state) {
ctx.checkException();
Thread.sleep(50);
}
[2/2] hadoop git commit: HADOOP-10668.
TestZKFailoverControllerStress#testExpireBackAndForth occasionally fails.
Contributed by Ming Ma.
Posted by cn...@apache.org.
HADOOP-10668. TestZKFailoverControllerStress#testExpireBackAndForth occasionally fails. Contributed by Ming Ma.
(cherry picked from commit 7fc1f2f5cf4312d72aeffb1a9cef497d00c60adb)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a70e2c15
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a70e2c15
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a70e2c15
Branch: refs/heads/branch-2
Commit: a70e2c15be29f861c3716e712233cd28a4751130
Parents: 5da33c5
Author: cnauroth <cn...@apache.org>
Authored: Mon Jan 19 11:28:30 2015 -0800
Committer: cnauroth <cn...@apache.org>
Committed: Mon Jan 19 11:28:42 2015 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/ha/ZKFailoverController.java | 4 +++-
.../src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java | 4 ++--
3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a70e2c15/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index d745746..553e367 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -366,6 +366,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-10542 Potential null pointer dereference in Jets3tFileSystemStore
retrieveBlock(). (Ted Yu via stevel)
+ HADOOP-10668. TestZKFailoverControllerStress#testExpireBackAndForth
+ occasionally fails. (Ming Ma via cnauroth)
+
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a70e2c15/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
index 46c485b..f58c3f4 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
@@ -153,7 +153,9 @@ public abstract class ZKFailoverController {
public HAServiceTarget getLocalTarget() {
return localTarget;
}
-
+
+ HAServiceState getServiceState() { return serviceState; }
+
public int run(final String[] args) throws Exception {
if (!localTarget.isAutoFailoverEnabled()) {
LOG.fatal("Automatic failover is not enabled for " + localTarget + "." +
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a70e2c15/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java
index 1db7924..cab59a4 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java
@@ -158,8 +158,8 @@ public class MiniZKFCCluster {
*/
public void waitForHAState(int idx, HAServiceState state)
throws Exception {
- DummyHAService svc = getService(idx);
- while (svc.state != state) {
+ DummyZKFC svc = getZkfc(idx);
+ while (svc.getServiceState() != state) {
ctx.checkException();
Thread.sleep(50);
}