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

YARN-4880. Running TestZKRMStateStorePerf with real zookeeper cluster throws NPE. Contributed by Sunil G 

(cherry picked from commit 552237d4a3)
This commit is contained in:
Rohith Sharma K S 2016-04-05 14:25:32 +05:30
parent ad08114b92
commit eec23580b4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,9 @@ public class TestZKRMStateStorePerf extends RMStateStoreTestBase
if (appTokenMgr != null) { if (appTokenMgr != null) {
appTokenMgr.stop(); appTokenMgr.stop();
} }
curatorTestingServer.stop(); if (curatorTestingServer != null) {
curatorTestingServer.stop();
}
} }
private void initStore(String hostPort) { private void initStore(String hostPort) {
@ -99,8 +101,9 @@ public class TestZKRMStateStorePerf extends RMStateStoreTestBase
RMContext rmContext = mock(RMContext.class); RMContext rmContext = mock(RMContext.class);
conf = new YarnConfiguration(); conf = new YarnConfiguration();
conf.set(YarnConfiguration.RM_ZK_ADDRESS, conf.set(YarnConfiguration.RM_ZK_ADDRESS, optHostPort
optHostPort.or(curatorTestingServer.getConnectString())); .or((curatorTestingServer == null) ? "" : curatorTestingServer
.getConnectString()));
conf.set(YarnConfiguration.ZK_RM_STATE_STORE_PARENT_PATH, workingZnode); conf.set(YarnConfiguration.ZK_RM_STATE_STORE_PARENT_PATH, workingZnode);
store = new ZKRMStateStore(); store = new ZKRMStateStore();