Changeset 253 for trunk/sources

Timestamp:

05/14/08 00:21:20 (16 years ago)

Author:

gkronber

Message:

improved handling of closed or faulted connections in job-manager for distributed engine (ticket #149)

File:

• trunk/sources/HeuristicLab.DistributedEngine/JobManager.cs (modified) (8 diffs)

trunk/sources/HeuristicLab.DistributedEngine/JobManager.cs

@@ -70 +70 @@
       do {
         lock(connectionLock) {
-          if(factory.State != CommunicationState.Opened)
-            ResetConnection();
           try {
             currentEngineGuid = server.BeginExecuteEngine(zippedEngine);
@@ -83 +81 @@
             }
           } catch(CommunicationException communicationException) {
+            ResetConnection();
             // wait some time and try again (limit with maximal retries if retry count reached throw exception -> engine can decide to stop execution)
             if(retryCount < MAX_CONNECTION_RETRIES) {
@@ -120 +119 @@
           int retries = 0;
           do {
-            if(factory.State != CommunicationState.Opened) ResetConnection();
             try {
               zippedResult = server.TryEndExecuteEngine(engineGuid, 100);
@@ -129 +127 @@
               Thread.Sleep(TimeSpan.FromSeconds(RETRY_TIMEOUT_SEC));
             } catch(CommunicationException communicationException) {
+              ResetConnection();
               success = false;
               retries++;
@@ -156 +155 @@
             try {
               lock(connectionLock) {
-                if(factory.State != CommunicationState.Opened) ResetConnection();
                 jobState = server.JobState(engineGuid);
               }
@@ -165 +163 @@
               Thread.Sleep(TimeSpan.FromSeconds(RETRY_TIMEOUT_SEC));
             } catch(CommunicationException communicationException) {
+              ResetConnection();
               retries++;
               success = false;
@@ -181 +180 @@
               try {
                 lock(connectionLock) {
-                  if(factory.State != CommunicationState.Opened) ResetConnection();
                   server.BeginExecuteEngine(packedEngine);
                 }
@@ -190 +188 @@
                 Thread.Sleep(TimeSpan.FromSeconds(RETRY_TIMEOUT_SEC));
               } catch(CommunicationException communicationException) {
+                ResetConnection();
                 success = false;
                 retries++;