commit 5f6946150b27bde30e7bed246053b58a49f599fb
author Mariia Mykhailova <mariia@apache.org> Wed Nov 23 11:48:47 2016 -0800
committer Julia Wang <jwang98052@yahoo.com> Mon Dec 05 17:59:30 2016 -0800
tree fd33c13a64e67bf8afe09977a2991a003a4edc3e
parent 977965c239ec59888c0dae5309d598f00848824c

[REEF-1464] Fix TestTaskCloseOnLocalRuntime failures in AppVeyor

Test failures are caused by delayed task cancellation,
which happens if task is trying to establish TCP connection with
an already cancelled task.

This change decreases time spent by task trying to establish
connection before failing (for this test only).

JIRA:
  [REEF-1464](https://issues.apache.org/jira/browse/REEF-1464)

Pull request:
  This closes #1199

lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUCloseTaskTest.cs

diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUCloseTaskTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUCloseTaskTest.cs
index 01a80fe..af1e758 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUCloseTaskTest.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/IMRUCloseTaskTest.cs
@@ -21,6 +21,7 @@
 using Org.Apache.REEF.Driver.Evaluator;
 using Org.Apache.REEF.Driver.Task;
 using Org.Apache.REEF.IMRU.OnREEF.Driver;
+using Org.Apache.REEF.Network;
 using Org.Apache.REEF.Tang.Annotations;
 using Org.Apache.REEF.Tang.Interface;
 using Org.Apache.REEF.Tang.Util;
@@ -58,7 +59,8 @@
             const int numOfRetryInRecovery = 4;
             var testFolder = DefaultRuntimeFolder + TestId;
             TestBroadCastAndReduce(false, numTasks, chunkSize, dims, iterations, mapperMemory, updateTaskMemory, numOfRetryInRecovery, testFolder);
-            string[] lines = ReadLogFile(DriverStdout, "driver", testFolder, 120);
+            string[] lines = ReadLogFile(DriverStdout, "driver", testFolder);
+
             var completedCount = GetMessageCount(lines, CompletedTaskMessage);
             var failedCount = GetMessageCount(lines, FailedTaskMessage);
             Assert.Equal(numTasks, completedCount + failedCount);
@@ -116,6 +118,14 @@
                 .Build();
         }
 
+        protected override IConfiguration GetTcpConnectionConfiguration()
+        {
+            return TcpClientConfigurationModule.ConfigurationModule
+                .Set(TcpClientConfigurationModule.MaxConnectionRetry, "5")
+                .Set(TcpClientConfigurationModule.SleepTime, "500")
+                .Build();
+        }
+
         /// <summary>
         /// Test handlers
         /// </summary>
@@ -136,7 +146,7 @@
             {
                 lock (_lock)
                 {
-                    Logger.Log(Level.Info, "Received running task:" + value.Id);
+                    Logger.Log(Level.Info, "Received running task:" + value.Id + " from container [" + value.ActiveContext.EvaluatorId + "]");
                     _runningTasks.Add(value.Id, value);
                     if (_runningTasks.Count == 4)
                     {

lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs

diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs
index fee7ac3..7b06025 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs
@@ -398,7 +398,7 @@
             }
         }
 
-        private IConfiguration GetTcpConnectionConfiguration()
+        protected virtual IConfiguration GetTcpConnectionConfiguration()
         {
             return TcpClientConfigurationModule.ConfigurationModule
                 .Set(TcpClientConfigurationModule.MaxConnectionRetry, "150")