Repository: incubator-slider Updated Branches: refs/heads/develop d2ef8cced -> 08d7aec8f
SLIDER-447 Post enablement of RM HA, Slider client still needs yarn.resourcemanager.address Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/08d7aec8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/08d7aec8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/08d7aec8 Branch: refs/heads/develop Commit: 08d7aec8f37b12c05830439b3a5e9b05e75248e8 Parents: d2ef8cc Author: Steve Loughran <[email protected]> Authored: Wed Oct 15 10:47:07 2014 -0700 Committer: Steve Loughran <[email protected]> Committed: Wed Oct 15 15:01:03 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/slider/client/SliderClient.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/08d7aec8/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java index ed62994..99fde78 100644 --- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -932,13 +932,14 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe } /** - * Verify that the Resource MAnager is configured, if not fail + * Verify that the Resource Manager is configured (on a non-HA cluster). * with a useful error message * @throws BadCommandArgumentsException the exception raised on an invalid config */ public void verifyBindingsDefined() throws BadCommandArgumentsException { InetSocketAddress rmAddr = SliderUtils.getRmAddress(getConfig()); - if (!SliderUtils.isAddressDefined(rmAddr)) { + if (!getConfig().getBoolean(YarnConfiguration.RM_HA_ENABLED, false) + && !SliderUtils.isAddressDefined(rmAddr)) { throw new BadCommandArgumentsException( "No valid Resource Manager address provided in the argument " + Arguments.ARG_MANAGER @@ -946,7 +947,6 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe + YarnConfiguration.RM_ADDRESS + " value :" + rmAddr); } - } /**
