Repository: reef Updated Branches: refs/heads/master 636af6afa -> 0147a8932
[REEF-1755] Clean up for IMRU test validation messages JIRA: [REEF-1755](https://issues.apache.org/jira/browse/REEF-1755) Pull request: This closes #1275 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/0147a893 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/0147a893 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/0147a893 Branch: refs/heads/master Commit: 0147a893261dff1ec99609b0a94364567e0dc921 Parents: 636af6a Author: Julia Wang <[email protected]> Authored: Tue Mar 21 17:25:51 2017 -0700 Committer: Markus Weimer <[email protected]> Committed: Wed Mar 22 08:58:43 2017 -0700 ---------------------------------------------------------------------- .../Functional/IMRU/IMRUBrodcastReduceTestBase.cs | 1 + .../Functional/IMRU/TestExceptionInResultHandlerDispose.cs | 2 +- .../Functional/IMRU/TestFailMapperEvaluatorsOnInit.cs | 2 +- .../TestFailMapperEvaluatorsWithFailedResultHandlerOnDispose.cs | 4 ++-- .../Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasks.cs | 4 ++-- .../Functional/IMRU/TestFailMapperTasksOnDispose.cs | 2 +- .../Functional/IMRU/TestFailMapperTasksOnInit.cs | 2 +- .../Functional/IMRU/TestFailUpdateEvaluator.cs | 2 +- .../IMRU/TestFailUpdateEvaluatorOnWaitingForEvaluator.cs | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/0147a893/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBrodcastReduceTestBase.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBrodcastReduceTestBase.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBrodcastReduceTestBase.cs index 5e98373..4555d7b 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBrodcastReduceTestBase.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUBrodcastReduceTestBase.cs @@ -56,6 +56,7 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU protected const string FailedTaskMessage = IMRUDriver<int[], int[], int[], int[]>.FailedTaskMessage; protected const string FailedEvaluatorMessage = IMRUDriver<int[], int[], int[], int[]>.FailedEvaluatorMessage; protected const string DoneActionMessage = IMRUDriver<int[], int[], int[], int[]>.DoneActionPrefix; + protected const string FailedActionMessage = IMRUDriver<int[], int[], int[], int[]>.FailActionPrefix; /// <summary> /// Abstract method for subclass to override it to provide configurations for driver handlers http://git-wip-us.apache.org/repos/asf/reef/blob/0147a893/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestExceptionInResultHandlerDispose.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestExceptionInResultHandlerDispose.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestExceptionInResultHandlerDispose.cs index 3ee5a45..945bc06 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestExceptionInResultHandlerDispose.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestExceptionInResultHandlerDispose.cs @@ -48,7 +48,7 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU string testFolder = DefaultRuntimeFolder + TestId; TestBroadCastAndReduce(false, numTasks, chunkSize, dims, iterations, mapperMemory, updateTaskMemory, numberOfRetryInRecovery, testFolder); string[] lines = ReadLogFile(DriverStdout, "driver", testFolder, 120); - var completedTaskCount = GetMessageCount(lines, "Received ICompletedTask"); + var completedTaskCount = GetMessageCount(lines, CompletedTaskMessage); var failedEvaluatorCount = GetMessageCount(lines, FailedEvaluatorMessage); var failedTaskCount = GetMessageCount(lines, FailedTaskMessage); var jobSuccess = GetMessageCount(lines, DoneActionMessage); http://git-wip-us.apache.org/repos/asf/reef/blob/0147a893/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 1246b67..0227282 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnInit.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsOnInit.cs @@ -53,7 +53,7 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU NumberOfRetry, testFolder); string[] lines = ReadLogFile(DriverStdout, "driver", testFolder, 360); - var completedTaskCount = GetMessageCount(lines, "Received ICompletedTask"); + var completedTaskCount = GetMessageCount(lines, CompletedTaskMessage); var failedEvaluatorCount = GetMessageCount(lines, FailedEvaluatorMessage); var failedTaskCount = GetMessageCount(lines, FailedTaskMessage); var jobSuccess = GetMessageCount(lines, DoneActionMessage); http://git-wip-us.apache.org/repos/asf/reef/blob/0147a893/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsWithFailedResultHandlerOnDispose.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsWithFailedResultHandlerOnDispose.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsWithFailedResultHandlerOnDispose.cs index 9728973..10deef6 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsWithFailedResultHandlerOnDispose.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorsWithFailedResultHandlerOnDispose.cs @@ -57,8 +57,8 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU // As the driver will shut down as soon as all tasks are in final state. The task state is final either by // ICompletedTask or IFailedEvaluator. But MessageLogger may not be able to receive the last event // before driver shut down. - var failedEvaluatorCount = GetMessageCount(lines, "Received IFailedEvaluator"); - var completedTaskCount = GetMessageCount(lines, "Received ICompletedTask"); + var failedEvaluatorCount = GetMessageCount(lines, FailedEvaluatorMessage); + var completedTaskCount = GetMessageCount(lines, CompletedTaskMessage); var failedTaskCount = GetMessageCount(lines, FailedTaskMessage); var jobSuccess = GetMessageCount(lines, DoneActionMessage); http://git-wip-us.apache.org/repos/asf/reef/blob/0147a893/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 41c6b77..6336c02 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasks.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasks.cs @@ -54,11 +54,11 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU NumberOfRetry, testFolder); string[] lines = ReadLogFile(DriverStdout, "driver", testFolder, 240); - var completedTaskCount = GetMessageCount(lines, "Received ICompletedTask"); + var completedTaskCount = GetMessageCount(lines, CompletedTaskMessage); var runningTaskCount = GetMessageCount(lines, RunningTaskMessage); var failedEvaluatorCount = GetMessageCount(lines, FailedEvaluatorMessage); var failedTaskCount = GetMessageCount(lines, FailedTaskMessage); - var jobFailure = GetMessageCount(lines, IMRUDriver<int[], int[], int[], int[]>.FailActionPrefix); + var jobFailure = GetMessageCount(lines, FailedActionMessage); // each task should fail or complete // there should be no failed evaluators http://git-wip-us.apache.org/repos/asf/reef/blob/0147a893/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 cf897fb..798a970 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnDispose.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnDispose.cs @@ -53,7 +53,7 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU NumberOfRetry, testFolder); string[] lines = ReadLogFile(DriverStdout, "driver", testFolder, 360); - var completedTaskCount = GetMessageCount(lines, "Received ICompletedTask"); + var completedTaskCount = GetMessageCount(lines, CompletedTaskMessage); var failedEvaluatorCount = GetMessageCount(lines, FailedEvaluatorMessage); var failedTaskCount = GetMessageCount(lines, FailedTaskMessage); var jobSuccess = GetMessageCount(lines, DoneActionMessage); http://git-wip-us.apache.org/repos/asf/reef/blob/0147a893/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 ca20a6c..f629c56 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnInit.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperTasksOnInit.cs @@ -53,7 +53,7 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU NumberOfRetry, testFolder); string[] lines = ReadLogFile(DriverStdout, "driver", testFolder, 240); - var completedTaskCount = GetMessageCount(lines, "Received ICompletedTask"); + var completedTaskCount = GetMessageCount(lines, CompletedTaskMessage); var failedEvaluatorCount = GetMessageCount(lines, FailedEvaluatorMessage); var failedTaskCount = GetMessageCount(lines, FailedTaskMessage); var jobSuccess = GetMessageCount(lines, DoneActionMessage); http://git-wip-us.apache.org/repos/asf/reef/blob/0147a893/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 213cac4..239ab1c 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailUpdateEvaluator.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailUpdateEvaluator.cs @@ -59,7 +59,7 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU NumberOfRetry, testFolder); string[] lines = ReadLogFile(DriverStdout, "driver", testFolder, 240); - var completedTaskCount = GetMessageCount(lines, "Received ICompletedTask"); + var completedTaskCount = GetMessageCount(lines, CompletedTaskMessage); var runningTaskCount = GetMessageCount(lines, RunningTaskMessage); var failedEvaluatorCount = GetMessageCount(lines, FailedEvaluatorMessage); var failedTaskCount = GetMessageCount(lines, FailedTaskMessage); http://git-wip-us.apache.org/repos/asf/reef/blob/0147a893/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailUpdateEvaluatorOnWaitingForEvaluator.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailUpdateEvaluatorOnWaitingForEvaluator.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailUpdateEvaluatorOnWaitingForEvaluator.cs index b12b1ef..8c09d28 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailUpdateEvaluatorOnWaitingForEvaluator.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailUpdateEvaluatorOnWaitingForEvaluator.cs @@ -50,7 +50,7 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU TestBroadCastAndReduce(false, numTasks, chunkSize, dims, iterations, mapperMemory, updateTaskMemory, numberOfRetryInRecovery, testFolder); string[] lines = ReadLogFile(DriverStdout, "driver", testFolder, 120); - var jobFailure = GetMessageCount(lines, IMRUDriver<int[], int[], int[], int[]>.FailActionPrefix); + var jobFailure = GetMessageCount(lines, FailedActionMessage); Assert.True(jobFailure > 0); CleanUp(testFolder); }
