invocation timeout fixed to respect long running operations

hazelcast · Jul 18, 2017 · e16f3ad · e16f3ad
1 parent 985de41
commit e16f3ad
Show file tree

Hide file tree

Showing 13 changed files with 296 additions and 32 deletions.
diff --git a/Hazelcast.Net/Hazelcast.Client.Connection/ClientConnectionManager.cs b/Hazelcast.Net/Hazelcast.Client.Connection/ClientConnectionManager.cs
@@ -82,12 +82,6 @@ public ClientConnectionManager(HazelcastClient client)
             }
             _socketInterceptor = null;
 
-            var timeout = EnvironmentUtil.ReadEnvironmentVar("hazelcast.client.invocation.timeout.seconds");
-            if (timeout > 0)
-            {
-                ThreadUtil.TaskOperationTimeOutMilliseconds = timeout.Value*1000;
-            }
-
             _heartbeatTimeout = EnvironmentUtil.ReadEnvironmentVar("hazelcast.client.heartbeat.timeout") ??
                                 _heartbeatTimeout;
             _heartbeatInterval = EnvironmentUtil.ReadEnvironmentVar("hazelcast.client.heartbeat.interval") ??

diff --git a/Hazelcast.Net/Hazelcast.Client.Spi/ClientInvocationService.cs b/Hazelcast.Net/Hazelcast.Client.Spi/ClientInvocationService.cs
@@ -269,10 +269,17 @@ private void HandleInvocationException(ClientInvocation invocation, Exception ex
                     }
                 }
                 //Fail with exception
-                if (!invocation.Future.IsComplete)
+                try
                 {
                     invocation.Future.Exception = exception;
                 }
+                catch (InvalidOperationException e)
+                {
+                    if (Logger.IsFinestEnabled())
+                    {
+                        Logger.Finest("Invocation already completed:", e);
+                    }
+                }
             }
             catch (Exception ex)
             {
@@ -530,7 +537,17 @@ private void HandleResponseMessage(IClientMessage response)
                 }
                 else
                 {
-                    invocation.Future.Result = response;
+                    try
+                    {
+                        invocation.Future.Result = response;
+                    }
+                    catch (InvalidOperationException e)
+                    {
+                        if (Logger.IsFinestEnabled())
+                        {
+                            Logger.Finest("Invocation already completed:", e);
+                        }
+                    }
                 }
             }
             else

diff --git a/Hazelcast.Net/Hazelcast.Util/ThreadUtil.cs b/Hazelcast.Net/Hazelcast.Util/ThreadUtil.cs
@@ -24,28 +24,31 @@ namespace Hazelcast.Util
 {
     internal sealed class ThreadUtil
     {
-        public static int TaskOperationTimeOutMilliseconds = 250*1000;
-
         public static IList<IClientMessage> GetResult(IEnumerable<IFuture<IClientMessage>> futures)
         {
             return futures.Select(future => GetResult(future)).ToList();
         }
 
-        public static IClientMessage GetResult(IFuture<IClientMessage> future, int? timeout = null)
+        public static IClientMessage GetResult(IFuture<IClientMessage> future)
+        {
+            return future.GetResult(Timeout.Infinite);
+        }
+
+        public static IClientMessage GetResult(IFuture<IClientMessage> future, int timeout)
         {
-            return future.GetResult(timeout ?? TaskOperationTimeOutMilliseconds);
+            return future.GetResult(timeout);
         }
 
         public static IClientMessage GetResult(Task<IClientMessage> task)
         {
-            return GetResult(task, TaskOperationTimeOutMilliseconds);
+            return GetResult(task, Timeout.Infinite);
         }
 
         public static IClientMessage GetResult(Task<IClientMessage> task, int timeout)
         {
             try
             {
-                var responseReady = task.Wait(TimeSpan.FromMilliseconds(TaskOperationTimeOutMilliseconds));
+                var responseReady = task.Wait(timeout);
                 if (!responseReady)
                 {
                     throw new TimeoutException("Operation time-out! No response received from the server.");

diff --git a/Hazelcast.Test/Hazelcast.Client.Test/ClientLongRunningTest.cs b/Hazelcast.Test/Hazelcast.Client.Test/ClientLongRunningTest.cs
@@ -0,0 +1,65 @@
+// Copyright (c) 2008-2017, Hazelcast, Inc. All Rights Reserved.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System;
+using Hazelcast.Core;
+using Hazelcast.Test;
+using NUnit.Framework;
+
+namespace Hazelcast.Client.Test
+{
+    [TestFixture]
+    [Category("enterprise")]
+    public class ClientLongRunningTest : SingleMemberBaseTest
+    {
+        private static IMap<object, object> map;
+
+        [SetUp]
+        public void Init()
+        {
+            map = Client.GetMap<object, object>(TestSupport.RandomString());
+            FillMap();
+        }
+
+        [TearDown]
+        public static void Destroy()
+        {
+            map.Clear();
+        }
+
+        protected override string GetServerConfig()
+        {
+            return Resources.hazelcast_delay;
+        }
+
+        private void FillMap()
+        {
+            for (var i = 0; i < 10; i++)
+            {
+                map.Put("key" + i, "value" + i);
+            }
+        }
+
+        [Test]
+        public void TestLongRunning()
+        {
+            var starTicks = DateTime.Now.Ticks;
+            var collection = map.Values(Predicates.Sql("this == 'value5'"));
+
+            var timeSpan = new TimeSpan(DateTime.Now.Ticks - starTicks);
+            Assert.IsNotEmpty(collection);
+            Assert.GreaterOrEqual(timeSpan.TotalSeconds, 300);
+        }
+    }
+}
diff --git a/Hazelcast.Test/Hazelcast.Client.Test/SingleMemberBaseTest.cs b/Hazelcast.Test/Hazelcast.Client.Test/SingleMemberBaseTest.cs
@@ -28,7 +28,7 @@ public class SingleMemberBaseTest : HazelcastTestSupport
         public void SetupCluster()
         {
             RemoteController = CreateRemoteController();
-            var cluster = CreateCluster(RemoteController);
+            var cluster = CreateCluster(RemoteController, GetServerConfig());
             RemoteController.startMember(cluster.Id);
             Client = CreateClient();
         }
@@ -39,5 +39,10 @@ public void ShutdownRemoteController()
             HazelcastClient.ShutdownAll();
             StopRemoteController(RemoteController);
         }
+
+        protected virtual string GetServerConfig()
+        {
+            return Resources.hazelcast;
+        }
     }
 }
diff --git a/Hazelcast.Test/Hazelcast.Test.csproj b/Hazelcast.Test/Hazelcast.Test.csproj
@@ -79,6 +79,7 @@
     <Compile Include="Hazelcast.Client.Model\IdentifiedFactory.cs" />
     <Compile Include="Hazelcast.Client.Test\AggregatorAndProjectionTest.cs" />
     <Compile Include="Hazelcast.Client.Test\ClientExecutorServiceTest.cs" />
+    <Compile Include="Hazelcast.Client.Test\ClientLongRunningTest.cs" />
     <Compile Include="Hazelcast.Client.Test\ClientSSLTest.cs" />
     <Compile Include="Hazelcast.Client.Test\PagingPredicateTest.cs" />
     <Compile Include="Hazelcast.Client.Test\PredicateExtTest.cs" />
@@ -259,6 +260,9 @@
   <ItemGroup>
     <None Include="Resources\hazelcast-ssl.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\hazelcast-delay.xml" />
+  </ItemGroup>
   <PropertyGroup>
     <NUnitResultsFile>$(OutputPath)nunit-result.xml</NUnitResultsFile>
   </PropertyGroup>

diff --git a/Hazelcast.Test/Properties/Resources.Designer.cs b/Hazelcast.Test/Properties/Resources.Designer.cs
diff --git a/Hazelcast.Test/Properties/Resources.resx b/Hazelcast.Test/Properties/Resources.resx
@@ -124,7 +124,10 @@
   <data name="hazelcast_config_full" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\hazelcast-client-full.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="hazelcast_delay" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\hazelcast-delay.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
   <data name="hazelcast_ssl" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\hazelcast-ssl.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>..\Resources\hazelcast-ssl.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
   </data>
 </root>
diff --git a/Hazelcast.Test/Resources/hazelcast-client-full.xml b/Hazelcast.Test/Resources/hazelcast-client-full.xml
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<hazelcast-client xsi:schemaLocation="http://www.hazelcast.com/schema/client-config hazelcast-client-config-3.5.xsd"
+<hazelcast-client xsi:schemaLocation="http://www.hazelcast.com/schema/client-config hazelcast-client-config-3.8.xsd"
                   xmlns="http://www.hazelcast.com/schema/client-config"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">