YARN-4880. Running TestZKRMStateStorePerf with real zookeeper cluster throws NPE. Contributed by Sunil G
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/552237d4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/552237d4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/552237d4 Branch: refs/heads/HDFS-1312 Commit: 552237d4a34ab10fa5f9ec7aad7942f2a110993e Parents: 818d6b7 Author: Rohith Sharma K S <rohithsharm...@apache.org> Authored: Tue Apr 5 14:25:32 2016 +0530 Committer: Rohith Sharma K S <rohithsharm...@apache.org> Committed: Tue Apr 5 14:26:19 2016 +0530 ---------------------------------------------------------------------- .../resourcemanager/recovery/TestZKRMStateStorePerf.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/552237d4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStorePerf.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStorePerf.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStorePerf.java index 4b0b06a..bd25def 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStorePerf.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestZKRMStateStorePerf.java @@ -91,7 +91,9 @@ public class TestZKRMStateStorePerf extends RMStateStoreTestBase if (appTokenMgr != null) { appTokenMgr.stop(); } - curatorTestingServer.stop(); + if (curatorTestingServer != null) { + curatorTestingServer.stop(); + } } private void initStore(String hostPort) { @@ -99,8 +101,9 @@ public class TestZKRMStateStorePerf extends RMStateStoreTestBase RMContext rmContext = mock(RMContext.class); conf = new YarnConfiguration(); - conf.set(YarnConfiguration.RM_ZK_ADDRESS, - optHostPort.or(curatorTestingServer.getConnectString())); + conf.set(YarnConfiguration.RM_ZK_ADDRESS, optHostPort + .or((curatorTestingServer == null) ? "" : curatorTestingServer + .getConnectString())); conf.set(YarnConfiguration.ZK_RM_STATE_STORE_PARENT_PATH, workingZnode); store = new ZKRMStateStore();
