Repository: reef Updated Branches: refs/heads/master 7e0f408c2 -> 96725fa77
[REEF-1753] Intermittent failures of CloseEvaluatorTest in local runtime Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/3df72673 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/3df72673 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/3df72673 Branch: refs/heads/master Commit: 3df726738abe66fea090fdce198d8bc445c4c8cb Parents: 636af6a Author: taegeonum <[email protected]> Authored: Thu Mar 23 15:07:01 2017 +0900 Committer: taegeonum <[email protected]> Committed: Thu Mar 23 15:07:01 2017 +0900 ---------------------------------------------------------------------- .../org/apache/reef/wake/WakeParameters.java | 2 +- .../reef/wake/remote/RemoteConfiguration.java | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/3df72673/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/WakeParameters.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/WakeParameters.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/WakeParameters.java index 616de17..b307dd3 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/WakeParameters.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/WakeParameters.java @@ -30,7 +30,7 @@ public final class WakeParameters { public static final long EXECUTOR_SHUTDOWN_TIMEOUT = 1000; - public static final long REMOTE_EXECUTOR_SHUTDOWN_TIMEOUT = 10000; + public static final long REMOTE_EXECUTOR_SHUTDOWN_TIMEOUT = 20000; /** * Maximum frame length unit. http://git-wip-us.apache.org/repos/asf/reef/blob/3df72673/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/RemoteConfiguration.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/RemoteConfiguration.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/RemoteConfiguration.java index db5eed4..a3efe69 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/RemoteConfiguration.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/RemoteConfiguration.java @@ -22,6 +22,7 @@ import org.apache.reef.tang.annotations.Name; import org.apache.reef.tang.annotations.NamedParameter; import org.apache.reef.wake.EStage; import org.apache.reef.wake.EventHandler; +import org.apache.reef.wake.WakeParameters; import org.apache.reef.wake.remote.impl.DefaultTransportEStage; import org.apache.reef.wake.remote.impl.ObjectSerializableCodec; import org.apache.reef.wake.remote.impl.TransportEvent; @@ -32,6 +33,21 @@ import org.apache.reef.wake.remote.impl.TransportEvent; public final class RemoteConfiguration { /** + * The number of tries to reconnect the remote connection. + */ + public static final long REMOTE_CONNECTION_NUMBER_OF_RETRIES = 3; + + /** + * The timeout of connection retrying. + */ + public static final long REMOTE_CONNECTION_RETRY_TIMEOUT = + WakeParameters.REMOTE_EXECUTOR_SHUTDOWN_TIMEOUT / (REMOTE_CONNECTION_NUMBER_OF_RETRIES + 1); + + private RemoteConfiguration() { + // empty + } + + /** * The name of the remote manager. */ @NamedParameter(short_name = "rm_name", doc = "The name of the remote manager.", default_value = "REEF_CLIENT") @@ -84,7 +100,7 @@ public final class RemoteConfiguration { /** * The number of tries. */ - @NamedParameter(doc = "The number of tries.", default_value = "3") + @NamedParameter(doc = "The number of tries.", default_value = "" + REMOTE_CONNECTION_NUMBER_OF_RETRIES) public static final class NumberOfTries implements Name<Integer> { // Intentionally empty } @@ -92,7 +108,7 @@ public final class RemoteConfiguration { /** * The timeout of connection retrying. */ - @NamedParameter(doc = "The timeout of connection retrying.", default_value = "10000") + @NamedParameter(doc = "The timeout of connection retrying.", default_value = "" + REMOTE_CONNECTION_RETRY_TIMEOUT) public static final class RetryTimeout implements Name<Integer> { // Intentionally empty }
