Fix TestLeaderElectorService
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5ba48368 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5ba48368 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5ba48368 Branch: refs/heads/yarn-5709 Commit: 5ba483685aa20c236036c84015fcd4e162d927e6 Parents: 4a6ed7e Author: Karthik Kambatla <ka...@apache.org> Authored: Tue Dec 6 20:39:17 2016 -0800 Committer: Karthik Kambatla <ka...@apache.org> Committed: Tue Dec 6 20:39:17 2016 -0800 ---------------------------------------------------------------------- .../hadoop/yarn/server/resourcemanager/MockRM.java | 15 +++++++++++++-- .../resourcemanager/TestLeaderElectorService.java | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5ba48368/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.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/MockRM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java index 1b354af..1ea2324 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java @@ -125,6 +125,8 @@ public class MockRM extends ResourceManager { private final boolean useNullRMNodeLabelsManager; private boolean disableDrainEventsImplicitly; + private boolean useRealElector = false; + public MockRM() { this(new YarnConfiguration()); } @@ -161,6 +163,11 @@ public class MockRM extends ResourceManager { disableDrainEventsImplicitly = false; } + public MockRM(Configuration conf, boolean useRealElector) { + this(conf); + this.useRealElector = useRealElector; + } + public class MockRMMemoryStateStore extends MemoryRMStateStore { @SuppressWarnings("rawtypes") @Override @@ -195,8 +202,12 @@ public class MockRM extends ResourceManager { } @Override - protected EmbeddedElector createEmbeddedElector() { - return mock(EmbeddedElector.class); + protected EmbeddedElector createEmbeddedElector() throws IOException { + if (useRealElector) { + return mock(EmbeddedElector.class); + } else { + return super.createEmbeddedElector(); + } } @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/5ba48368/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestLeaderElectorService.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/TestLeaderElectorService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestLeaderElectorService.java index e58d77e..0c2ee5c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestLeaderElectorService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestLeaderElectorService.java @@ -249,7 +249,7 @@ public class TestLeaderElectorService { private MockRM startRM(String rmId, HAServiceState state) throws Exception{ YarnConfiguration yarnConf = new YarnConfiguration(conf); yarnConf.set(YarnConfiguration.RM_HA_ID, rmId); - MockRM rm = new MockRM(yarnConf); + MockRM rm = new MockRM(yarnConf, true); rm.init(yarnConf); rm.start(); waitFor(rm, state); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
