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

YARN-1281. Fixed TestZKRMStateStoreZKClientConnections to not fail intermittently due to ZK-client timeouts. Contributed by Tsuyoshi Ozawa. 

svn merge --ignore-ancestry -c 1588369 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588371 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2014-04-17 20:58:23 +00:00
parent e39ce638b6
commit 1aad26034b
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,6 +126,9 @@ Release 2.4.1 - UNRELEASED
YARN-1947. TestRMDelegationTokens#testRMDTMasterKeyStateOnRollingMasterKey YARN-1947. TestRMDelegationTokens#testRMDTMasterKeyStateOnRollingMasterKey
is failing intermittently. (Jian He via junping_du) is failing intermittently. (Jian He via junping_du)
YARN-1281. Fixed TestZKRMStateStoreZKClientConnections to not fail
intermittently due to ZK-client timeouts. (Tsuyoshi Ozawa via vinodkv)
Release 2.4.0 - 2014-04-07 Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

11
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStoreZKClientConnections.java
View File

@ -48,6 +48,7 @@ public class TestZKRMStateStoreZKClientConnections extends
ClientBaseWithFixes { ClientBaseWithFixes {
private static final int ZK_OP_WAIT_TIME = 3000; private static final int ZK_OP_WAIT_TIME = 3000;
private static final int ZK_TIMEOUT_MS = 1000;
private Log LOG = private Log LOG =
LogFactory.getLog(TestZKRMStateStoreZKClientConnections.class); LogFactory.getLog(TestZKRMStateStoreZKClientConnections.class);
@ -84,7 +85,7 @@ public class TestZKRMStateStoreZKClientConnections extends
@Override @Override
public ZooKeeper getNewZooKeeper() public ZooKeeper getNewZooKeeper()
throws IOException, InterruptedException { throws IOException, InterruptedException {
return createClient(watcher, hostPort, 100); return createClient(watcher, hostPort, ZK_TIMEOUT_MS);
} }
@Override @Override
@ -136,7 +137,7 @@ public class TestZKRMStateStoreZKClientConnections extends
TestZKClient zkClientTester = new TestZKClient(); TestZKClient zkClientTester = new TestZKClient();
final String path = "/test"; final String path = "/test";
YarnConfiguration conf = new YarnConfiguration(); YarnConfiguration conf = new YarnConfiguration();
conf.setInt(YarnConfiguration.RM_ZK_TIMEOUT_MS, 1000); conf.setInt(YarnConfiguration.RM_ZK_TIMEOUT_MS, ZK_TIMEOUT_MS);
conf.setLong(YarnConfiguration.RM_ZK_RETRY_INTERVAL_MS, 100); conf.setLong(YarnConfiguration.RM_ZK_RETRY_INTERVAL_MS, 100);
final ZKRMStateStore store = final ZKRMStateStore store =
(ZKRMStateStore) zkClientTester.getRMStateStore(conf); (ZKRMStateStore) zkClientTester.getRMStateStore(conf);
@ -169,7 +170,7 @@ public class TestZKRMStateStoreZKClientConnections extends
TestZKClient zkClientTester = new TestZKClient(); TestZKClient zkClientTester = new TestZKClient();
String path = "/test"; String path = "/test";
YarnConfiguration conf = new YarnConfiguration(); YarnConfiguration conf = new YarnConfiguration();
conf.setInt(YarnConfiguration.RM_ZK_TIMEOUT_MS, 100); conf.setInt(YarnConfiguration.RM_ZK_TIMEOUT_MS, ZK_TIMEOUT_MS);
ZKRMStateStore store = ZKRMStateStore store =
(ZKRMStateStore) zkClientTester.getRMStateStore(conf); (ZKRMStateStore) zkClientTester.getRMStateStore(conf);
TestDispatcher dispatcher = new TestDispatcher(); TestDispatcher dispatcher = new TestDispatcher();
@ -211,7 +212,7 @@ public class TestZKRMStateStoreZKClientConnections extends
TestZKClient zkClientTester = new TestZKClient(); TestZKClient zkClientTester = new TestZKClient();
String path = "/test"; String path = "/test";
YarnConfiguration conf = new YarnConfiguration(); YarnConfiguration conf = new YarnConfiguration();
conf.setInt(YarnConfiguration.RM_ZK_TIMEOUT_MS, 100); conf.setInt(YarnConfiguration.RM_ZK_TIMEOUT_MS, ZK_TIMEOUT_MS);
ZKRMStateStore store = ZKRMStateStore store =
(ZKRMStateStore) zkClientTester.getRMStateStore(conf); (ZKRMStateStore) zkClientTester.getRMStateStore(conf);
TestDispatcher dispatcher = new TestDispatcher(); TestDispatcher dispatcher = new TestDispatcher();
@ -274,7 +275,7 @@ public class TestZKRMStateStoreZKClientConnections extends
TestZKClient zkClientTester = new TestZKClient(); TestZKClient zkClientTester = new TestZKClient();
YarnConfiguration conf = new YarnConfiguration(); YarnConfiguration conf = new YarnConfiguration();
conf.setInt(YarnConfiguration.RM_ZK_NUM_RETRIES, 1); conf.setInt(YarnConfiguration.RM_ZK_NUM_RETRIES, 1);
conf.setInt(YarnConfiguration.RM_ZK_TIMEOUT_MS, 100); conf.setInt(YarnConfiguration.RM_ZK_TIMEOUT_MS, ZK_TIMEOUT_MS);
conf.set(YarnConfiguration.RM_ZK_ACL, TEST_ACL); conf.set(YarnConfiguration.RM_ZK_ACL, TEST_ACL);
conf.set(YarnConfiguration.RM_ZK_AUTH, TEST_AUTH_GOOD); conf.set(YarnConfiguration.RM_ZK_AUTH, TEST_AUTH_GOOD);