Repository: reef Updated Branches: refs/heads/master 5f6946150 -> 7c04284ed
[REEF-1683] Use default MaxRetryNumberInRecovery properly This change: * Updates default value of MaxRetryNumberInRecovery to 10 for our stress testing. For functional tests, we already set required values in the test code to override default. * Sets the same default value in IMRUJobDefinitionBuilder. * Removes the default value for MaxRetryNumberInRecovery in IMRUDriver. We use either the value bound by the client or default for the named parameter. JIRA: [REEF-1683](https://issues.apache.org/jira/browse/REEF-1683) Pull request: This closes #1198 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/7c04284e Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/7c04284e Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/7c04284e Branch: refs/heads/master Commit: 7c04284ede34fe5c51f42c4b84b99c1dde0b9a4b Parents: 5f69461 Author: Julia Wang <[email protected]> Authored: Tue Dec 6 11:03:49 2016 -0800 Committer: Mariia Mykhailova <[email protected]> Committed: Tue Dec 6 11:22:44 2016 -0800 ---------------------------------------------------------------------- lang/cs/Org.Apache.REEF.IMRU.Examples/Run.cs | 2 +- lang/cs/Org.Apache.REEF.IMRU/API/IMRUJobDefinitionBuilder.cs | 2 +- lang/cs/Org.Apache.REEF.IMRU/OnREEF/Driver/IMRUDriver.cs | 4 +--- .../OnREEF/Parameters/MaxRetryNumberInRecovery.cs | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/7c04284e/lang/cs/Org.Apache.REEF.IMRU.Examples/Run.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU.Examples/Run.cs b/lang/cs/Org.Apache.REEF.IMRU.Examples/Run.cs index 746e5e2..106802d 100644 --- a/lang/cs/Org.Apache.REEF.IMRU.Examples/Run.cs +++ b/lang/cs/Org.Apache.REEF.IMRU.Examples/Run.cs @@ -65,7 +65,7 @@ namespace Org.Apache.REEF.IMRU.Examples int iterations = 100; int mapperMemory = 512; int updateTaskMemory = 512; - int maxRetryNumberInRecovery = 2; + int maxRetryNumberInRecovery = 10; int totalNumberOfForcedFailures = 2; if (args.Length > 0) http://git-wip-us.apache.org/repos/asf/reef/blob/7c04284e/lang/cs/Org.Apache.REEF.IMRU/API/IMRUJobDefinitionBuilder.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/API/IMRUJobDefinitionBuilder.cs b/lang/cs/Org.Apache.REEF.IMRU/API/IMRUJobDefinitionBuilder.cs index bf1b75b..e63bb69 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/API/IMRUJobDefinitionBuilder.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/API/IMRUJobDefinitionBuilder.cs @@ -72,7 +72,7 @@ namespace Org.Apache.REEF.IMRU.API _updateTaskMemory = 512; _coresPerMapper = 1; _updateTaskCores = 1; - _maxRetryNumberInRecovery = 0; + _maxRetryNumberInRecovery = 10; // default value of MaxRetryNumberInRecovery named parameter _invokeGC = true; _perMapConfigGeneratorConfig = new HashSet<IConfiguration>(); _jobCancellationConfiguration = EmptyConfiguration; http://git-wip-us.apache.org/repos/asf/reef/blob/7c04284e/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Driver/IMRUDriver.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Driver/IMRUDriver.cs b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Driver/IMRUDriver.cs index 52e7c6a..a895a78 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Driver/IMRUDriver.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Driver/IMRUDriver.cs @@ -131,8 +131,6 @@ namespace Org.Apache.REEF.IMRU.OnREEF.Driver /// </summary> private readonly List<IDisposable> _disposableResources = new List<IDisposable>(); - private const int DefaultMaxNumberOfRetryInRecovery = 3; - [Inject] private IMRUDriver(IPartitionedInputDataSet dataSet, [Parameter(typeof(PerMapConfigGeneratorSet))] ISet<IPerMapperConfigGenerator> perMapperConfigs, @@ -155,7 +153,7 @@ namespace Org.Apache.REEF.IMRU.OnREEF.Driver _perMapperConfigs = perMapperConfigs; _totalMappers = dataSet.Count; _invokeGC = invokeGC; - _maxRetryNumberForFaultTolerant = maxRetryNumberInRecovery > 0 ? maxRetryNumberInRecovery : DefaultMaxNumberOfRetryInRecovery; + _maxRetryNumberForFaultTolerant = maxRetryNumberInRecovery; _contextManager = new ActiveContextManager(_totalMappers + 1); _contextManager.Subscribe(this); http://git-wip-us.apache.org/repos/asf/reef/blob/7c04284e/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Parameters/MaxRetryNumberInRecovery.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Parameters/MaxRetryNumberInRecovery.cs b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Parameters/MaxRetryNumberInRecovery.cs index cc7a5b7..b9e6a4d 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Parameters/MaxRetryNumberInRecovery.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Parameters/MaxRetryNumberInRecovery.cs @@ -22,7 +22,7 @@ namespace Org.Apache.REEF.IMRU.OnREEF.Parameters /// <summary> /// Max retry number for the system recovery /// </summary> - [NamedParameter("Maximum retry number in fault tolerant recovery.", "maxRetryInRecovery", "3")] + [NamedParameter("Maximum retry number in fault tolerant recovery.", "maxRetryInRecovery", "10")] public sealed class MaxRetryNumberInRecovery : Name<int> { }
