Repository: reef Updated Branches: refs/heads/master 59b766e87 -> f5107f0eb
http://git-wip-us.apache.org/repos/asf/reef/blob/f5107f0e/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnDispose.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnDispose.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnDispose.cs index d6c76be..017580e 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnDispose.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnDispose.cs @@ -23,6 +23,7 @@ using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; using Xunit; +using TestSenderMapFunction = Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.PipelinedBroadcastAndReduceWithFaultTolerant.SenderMapFunctionFT; namespace Org.Apache.REEF.Tests.Functional.IMRU { @@ -73,15 +74,15 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU { var c = IMRUMapConfiguration<int[], int[]>.ConfigurationModule .Set(IMRUMapConfiguration<int[], int[]>.MapFunction, - GenericType<FaultTolerantPipelinedBroadcastAndReduce.TestSenderMapFunction>.Class) + GenericType<TestSenderMapFunction>.Class) .Build(); return TangFactory.GetTang().NewConfigurationBuilder(c) - .BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-2-") - .BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-3-") - .BindIntNamedParam<FaultTolerantPipelinedBroadcastAndReduce.FailureType>(FaultTolerantPipelinedBroadcastAndReduce.FailureType.EvaluatorFailureDuringTaskDispose.ToString()) + .BindSetEntry<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail, string>(GenericType<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-2-") + .BindSetEntry<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail, string>(GenericType<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-3-") + .BindIntNamedParam<PipelinedBroadcastAndReduceWithFaultTolerant.FailureType>(PipelinedBroadcastAndReduceWithFaultTolerant.FailureType.EvaluatorFailureDuringTaskDispose.ToString()) .BindNamedParameter(typeof(MaxRetryNumberInRecovery), NumberOfRetry.ToString()) - .BindNamedParameter(typeof(FaultTolerantPipelinedBroadcastAndReduce.TotalNumberOfForcedFailures), NumberOfRetry.ToString()) + .BindNamedParameter(typeof(PipelinedBroadcastAndReduceWithFaultTolerant.TotalNumberOfForcedFailures), NumberOfRetry.ToString()) .Build(); } } http://git-wip-us.apache.org/repos/asf/reef/blob/f5107f0e/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnInit.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnInit.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnInit.cs index 72f3103..b94d699 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnInit.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnInit.cs @@ -23,6 +23,7 @@ using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; using Xunit; +using TestSenderMapFunction = Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.PipelinedBroadcastAndReduceWithFaultTolerant.SenderMapFunctionFT; namespace Org.Apache.REEF.Tests.Functional.IMRU { @@ -74,15 +75,15 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU { var c = IMRUMapConfiguration<int[], int[]>.ConfigurationModule .Set(IMRUMapConfiguration<int[], int[]>.MapFunction, - GenericType<FaultTolerantPipelinedBroadcastAndReduce.TestSenderMapFunction>.Class) + GenericType<TestSenderMapFunction>.Class) .Build(); return TangFactory.GetTang().NewConfigurationBuilder(c) - .BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-2-") - .BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-3-") - .BindIntNamedParam<FaultTolerantPipelinedBroadcastAndReduce.FailureType>(FaultTolerantPipelinedBroadcastAndReduce.FailureType.EvaluatorFailureDuringTaskInitialization.ToString()) + .BindSetEntry<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail, string>(GenericType<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-2-") + .BindSetEntry<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail, string>(GenericType<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-3-") + .BindIntNamedParam<PipelinedBroadcastAndReduceWithFaultTolerant.FailureType>(PipelinedBroadcastAndReduceWithFaultTolerant.FailureType.EvaluatorFailureDuringTaskInitialization.ToString()) .BindNamedParameter(typeof(MaxRetryNumberInRecovery), NumberOfRetry.ToString()) - .BindNamedParameter(typeof(FaultTolerantPipelinedBroadcastAndReduce.TotalNumberOfForcedFailures), NumberOfRetry.ToString()) + .BindNamedParameter(typeof(PipelinedBroadcastAndReduceWithFaultTolerant.TotalNumberOfForcedFailures), NumberOfRetry.ToString()) .Build(); } } http://git-wip-us.apache.org/repos/asf/reef/blob/f5107f0e/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasks.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasks.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasks.cs index 5915c52..41c6b77 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasks.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasks.cs @@ -18,14 +18,12 @@ using Org.Apache.REEF.IMRU.API; using Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce; using Org.Apache.REEF.IMRU.OnREEF.Driver; -using TaskIdsToFail = Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail; -using FailureType = Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.FailureType; -using TestSenderMapFunction = Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.FaultTolerantPipelinedBroadcastAndReduce.TestSenderMapFunction; using Org.Apache.REEF.IMRU.OnREEF.Parameters; using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; using Xunit; +using TestSenderMapFunction = Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.PipelinedBroadcastAndReduceWithFaultTolerant.SenderMapFunctionFT; namespace Org.Apache.REEF.Tests.Functional.IMRU { @@ -87,11 +85,11 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU .Build(); return TangFactory.GetTang().NewConfigurationBuilder(c) - .BindSetEntry<TaskIdsToFail, string>(GenericType<TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-2-") - .BindSetEntry<TaskIdsToFail, string>(GenericType<TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-3-") - .BindIntNamedParam<FailureType>(FailureType.TaskFailureDuringTaskExecution.ToString()) + .BindSetEntry<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail, string>(GenericType<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-2-") + .BindSetEntry<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail, string>(GenericType<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-3-") + .BindIntNamedParam<PipelinedBroadcastAndReduceWithFaultTolerant.FailureType>(PipelinedBroadcastAndReduceWithFaultTolerant.FailureType.TaskFailureDuringTaskExecution.ToString()) .BindNamedParameter(typeof(MaxRetryNumberInRecovery), NumberOfRetry.ToString()) - .BindNamedParameter(typeof(FaultTolerantPipelinedBroadcastAndReduce.TotalNumberOfForcedFailures), NumberOfRetry.ToString()) + .BindNamedParameter(typeof(PipelinedBroadcastAndReduceWithFaultTolerant.TotalNumberOfForcedFailures), NumberOfRetry.ToString()) .Build(); } } http://git-wip-us.apache.org/repos/asf/reef/blob/f5107f0e/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnDispose.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnDispose.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnDispose.cs index 4faf66b..1d1176c 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnDispose.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnDispose.cs @@ -23,6 +23,7 @@ using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; using Xunit; +using TestSenderMapFunction = Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.PipelinedBroadcastAndReduceWithFaultTolerant.SenderMapFunctionFT; namespace Org.Apache.REEF.Tests.Functional.IMRU { @@ -72,15 +73,15 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU { var c = IMRUMapConfiguration<int[], int[]>.ConfigurationModule .Set(IMRUMapConfiguration<int[], int[]>.MapFunction, - GenericType<FaultTolerantPipelinedBroadcastAndReduce.TestSenderMapFunction>.Class) + GenericType<TestSenderMapFunction>.Class) .Build(); return TangFactory.GetTang().NewConfigurationBuilder(c) - .BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-2-") - .BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-3-") - .BindIntNamedParam<FaultTolerantPipelinedBroadcastAndReduce.FailureType>(FaultTolerantPipelinedBroadcastAndReduce.FailureType.TaskFailureDuringTaskDispose.ToString()) + .BindSetEntry<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail, string>(GenericType<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-2-") + .BindSetEntry<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail, string>(GenericType<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-3-") + .BindIntNamedParam<PipelinedBroadcastAndReduceWithFaultTolerant.FailureType>(PipelinedBroadcastAndReduceWithFaultTolerant.FailureType.TaskFailureDuringTaskDispose.ToString()) .BindNamedParameter(typeof(MaxRetryNumberInRecovery), NumberOfRetry.ToString()) - .BindNamedParameter(typeof(FaultTolerantPipelinedBroadcastAndReduce.TotalNumberOfForcedFailures), NumberOfRetry.ToString()) + .BindNamedParameter(typeof(PipelinedBroadcastAndReduceWithFaultTolerant.TotalNumberOfForcedFailures), NumberOfRetry.ToString()) .Build(); } } http://git-wip-us.apache.org/repos/asf/reef/blob/f5107f0e/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnInit.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnInit.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnInit.cs index 2851c3a..cd2d6b3 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnInit.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnInit.cs @@ -23,6 +23,7 @@ using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; using Xunit; +using TestSenderMapFunction = Org.Apache.REEF.IMRU.Examples.PipelinedBroadcastReduce.PipelinedBroadcastAndReduceWithFaultTolerant.SenderMapFunctionFT; namespace Org.Apache.REEF.Tests.Functional.IMRU { @@ -77,15 +78,15 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU { var c = IMRUMapConfiguration<int[], int[]>.ConfigurationModule .Set(IMRUMapConfiguration<int[], int[]>.MapFunction, - GenericType<FaultTolerantPipelinedBroadcastAndReduce.TestSenderMapFunction>.Class) + GenericType<TestSenderMapFunction>.Class) .Build(); return TangFactory.GetTang().NewConfigurationBuilder(c) - .BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-2-") - .BindSetEntry<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail, string>(GenericType<FaultTolerantPipelinedBroadcastAndReduce.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-3-") - .BindIntNamedParam<FaultTolerantPipelinedBroadcastAndReduce.FailureType>(FaultTolerantPipelinedBroadcastAndReduce.FailureType.TaskFailureDuringTaskInitialization.ToString()) + .BindSetEntry<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail, string>(GenericType<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-2-") + .BindSetEntry<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail, string>(GenericType<PipelinedBroadcastAndReduceWithFaultTolerant.TaskIdsToFail>.Class, "IMRUMap-RandomInputPartition-3-") + .BindIntNamedParam<PipelinedBroadcastAndReduceWithFaultTolerant.FailureType>(PipelinedBroadcastAndReduceWithFaultTolerant.FailureType.TaskFailureDuringTaskInitialization.ToString()) .BindNamedParameter(typeof(MaxRetryNumberInRecovery), NumberOfRetry.ToString()) - .BindNamedParameter(typeof(FaultTolerantPipelinedBroadcastAndReduce.TotalNumberOfForcedFailures), NumberOfRetry.ToString()) + .BindNamedParameter(typeof(PipelinedBroadcastAndReduceWithFaultTolerant.TotalNumberOfForcedFailures), NumberOfRetry.ToString()) .Build(); } } http://git-wip-us.apache.org/repos/asf/reef/blob/f5107f0e/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailUpdateEvaluator.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailUpdateEvaluator.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailUpdateEvaluator.cs index 1929c96..ff2245f 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailUpdateEvaluator.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailUpdateEvaluator.cs @@ -132,7 +132,7 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU /// Mapper function configuration. Subclass can override it to have its own test function. /// </summary> /// <returns></returns> - protected override IConfiguration BuildUpdateFunctionConfig() + protected override IConfiguration BuildUpdateFunctionConfigModule() { var c = IMRUUpdateConfiguration<int[], int[], int[]>.ConfigurationModule .Set(IMRUUpdateConfiguration<int[], int[], int[]>.UpdateFunction, @@ -140,7 +140,7 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU .Build(); return TangFactory.GetTang().NewConfigurationBuilder(c) - .BindIntNamedParam<FaultTolerantPipelinedBroadcastAndReduce.FailureType>(FaultTolerantPipelinedBroadcastAndReduce.FailureType.EvaluatorFailureDuringTaskExecution.ToString()) + .BindIntNamedParam<PipelinedBroadcastAndReduceWithFaultTolerant.FailureType>(PipelinedBroadcastAndReduceWithFaultTolerant.FailureType.EvaluatorFailureDuringTaskExecution.ToString()) .Build(); } @@ -160,7 +160,7 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU [Parameter(typeof(BroadcastReduceConfiguration.Dimensions))] int dim, [Parameter(typeof(BroadcastReduceConfiguration.NumWorkers))] int numWorkers, [Parameter(typeof(TaskConfigurationOptions.Identifier))] string taskId, - [Parameter(typeof(FaultTolerantPipelinedBroadcastAndReduce.FailureType))] int failureType) + [Parameter(typeof(PipelinedBroadcastAndReduceWithFaultTolerant.FailureType))] int failureType) { _maxIters = maxIters; _iterations = 0; @@ -170,7 +170,7 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU _taskId = taskId; _failureType = failureType; Logger.Log(Level.Info, "TestUpdateFunction: TaskId: {0}", _taskId); - Logger.Log(Level.Info, "Failure type: {0} failure", FaultTolerantPipelinedBroadcastAndReduce.FailureType.IsEvaluatorFailure(_failureType) ? "evaluator" : "task"); + Logger.Log(Level.Info, "Failure type: {0} failure", PipelinedBroadcastAndReduceWithFaultTolerant.FailureType.IsEvaluatorFailure(_failureType) ? "evaluator" : "task"); } /// <summary> @@ -221,9 +221,9 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU if (_iterations == 10 && !_taskId.EndsWith("-" + NumberOfRetry)) { Logger.Log(Level.Warning, "Simulating {0} failure for taskId {1}", - FaultTolerantPipelinedBroadcastAndReduce.FailureType.IsEvaluatorFailure(_failureType) ? "evaluator" : "task", + PipelinedBroadcastAndReduceWithFaultTolerant.FailureType.IsEvaluatorFailure(_failureType) ? "evaluator" : "task", _taskId); - if (FaultTolerantPipelinedBroadcastAndReduce.FailureType.IsEvaluatorFailure(_failureType)) + if (PipelinedBroadcastAndReduceWithFaultTolerant.FailureType.IsEvaluatorFailure(_failureType)) { // simulate evaluator failure Environment.Exit(1);
