You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by bi...@apache.org on 2016/12/22 23:04:21 UTC
incubator-slider git commit: SLIDER-1182 Slider AM should wait
forever for RM
Repository: incubator-slider
Updated Branches:
refs/heads/develop 5b1f5c033 -> d5aebbbb5
SLIDER-1182 Slider AM should wait forever for RM
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d5aebbbb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d5aebbbb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d5aebbbb
Branch: refs/heads/develop
Commit: d5aebbbb5241dbaf6df6dfb934c05af4cf121148
Parents: 5b1f5c0
Author: Billie Rinaldi <bi...@apache.org>
Authored: Thu Dec 22 14:59:44 2016 -0800
Committer: Billie Rinaldi <bi...@apache.org>
Committed: Thu Dec 22 14:59:44 2016 -0800
----------------------------------------------------------------------
.../org/apache/slider/server/appmaster/SliderAppMaster.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d5aebbbb/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
index 040f12b..1a27374 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
@@ -714,6 +714,11 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
synchronized (appState) {
int heartbeatInterval = HEARTBEAT_INTERVAL;
+ // configure AM to wait forever for RM
+ getConfig().setLong(YarnConfiguration.RESOURCEMANAGER_CONNECT_MAX_WAIT_MS,
+ -1);
+ getConfig().unset(YarnConfiguration.CLIENT_FAILOVER_MAX_ATTEMPTS);
+
// add the RM client -this brings the callbacks in
asyncRMClient = AMRMClientAsync.createAMRMClientAsync(heartbeatInterval, this);
addService(asyncRMClient);