Repository: incubator-slider Updated Branches: refs/heads/develop df20b51e4 -> ab04b6add
SLIDER-923 switch to TryOnceThenFail retry policy Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ab04b6ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ab04b6ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ab04b6ad Branch: refs/heads/develop Commit: ab04b6add193290b513949521d4941f1c3cf5570 Parents: df20b51 Author: Steve Loughran <[email protected]> Authored: Wed Jul 29 18:05:05 2015 -0700 Committer: Steve Loughran <[email protected]> Committed: Wed Jul 29 18:05:05 2015 -0700 ---------------------------------------------------------------------- .../apache/slider/server/appmaster/rpc/RpcBinder.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ab04b6ad/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/RpcBinder.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/RpcBinder.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/RpcBinder.java index d5c9df7..b64a098 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/RpcBinder.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/RpcBinder.java @@ -21,8 +21,8 @@ package org.apache.slider.server.appmaster.rpc; import com.google.common.base.Preconditions; import com.google.protobuf.BlockingService; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.io.retry.RetryPolicies; import org.apache.hadoop.io.retry.RetryPolicy; -import org.apache.hadoop.io.retry.RetryUtils; import org.apache.hadoop.ipc.ProtobufRpcEngine; import org.apache.hadoop.ipc.ProtocolProxy; import org.apache.hadoop.ipc.RPC; @@ -147,14 +147,7 @@ public class RpcBinder { Class<SliderClusterProtocolPB> sliderClusterAPIClass = registerSliderAPI(conf); - final RetryPolicy retryPolicy = - RetryUtils.getDefaultRetryPolicy( - conf, - KEY_IPC_CLIENT_RETRY_POLICY_ENABLED, - IPC_CLIENT_RETRY_POLICY_ENABLED_DEFAULT, - KEY_IPC_CLIENT_RETRY_POLICY_SPEC, - IPC_CLIENT_RETRY_POLICY_SPEC_DEFAULT, - ServiceNotReadyException.class); + final RetryPolicy retryPolicy = RetryPolicies.TRY_ONCE_THEN_FAIL; log.debug("Connecting to Slider AM at {}", addr); ProtocolProxy<SliderClusterProtocolPB> protoProxy = RPC.getProtocolProxy(sliderClusterAPIClass,
