Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10668. TestZKFailoverControllerStress#testExpireBackAndForth occasionally fails. Contributed by Ming Ma. 

(cherry picked from commit 7fc1f2f5cf)
This commit is contained in:
cnauroth 2015-01-19 11:28:30 -08:00
parent 5da33c5b5d
commit a70e2c15be
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -366,6 +366,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-10542 Potential null pointer dereference in Jets3tFileSystemStore HADOOP-10542 Potential null pointer dereference in Jets3tFileSystemStore
retrieveBlock(). (Ted Yu via stevel) retrieveBlock(). (Ted Yu via stevel)
HADOOP-10668. TestZKFailoverControllerStress#testExpireBackAndForth
occasionally fails. (Ming Ma via cnauroth)
Release 2.6.0 - 2014-11-18 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
View File

@ -153,7 +153,9 @@ public abstract class ZKFailoverController {
public HAServiceTarget getLocalTarget() { public HAServiceTarget getLocalTarget() {
return localTarget; return localTarget;
} }
HAServiceState getServiceState() { return serviceState; }
public int run(final String[] args) throws Exception { public int run(final String[] args) throws Exception {
if (!localTarget.isAutoFailoverEnabled()) { if (!localTarget.isAutoFailoverEnabled()) {
LOG.fatal("Automatic failover is not enabled for " + localTarget + "." + LOG.fatal("Automatic failover is not enabled for " + localTarget + "." +

4
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java
View File

@ -158,8 +158,8 @@ public class MiniZKFCCluster {
*/ */
public void waitForHAState(int idx, HAServiceState state) public void waitForHAState(int idx, HAServiceState state)
throws Exception { throws Exception {
DummyHAService svc = getService(idx); DummyZKFC svc = getZkfc(idx);
while (svc.state != state) { while (svc.getServiceState() != state) {
ctx.checkException(); ctx.checkException();
Thread.sleep(50); Thread.sleep(50);
} }