Changeset 6971

Timestamp:

11/08/11 14:33:00 (11 years ago)

Author:

ascheibe

Message:

#1233 prevent appdomain leases from timing out if communication with server is interrupted

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab 3.3.exe.config (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.3/ExecutorQueue.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.Designer.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.settings (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.3/SlaveTask.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.3/app.config (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.3/app_ascheibe.config (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.3/app_f005pc.config (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.3/app_services.config (modified) (1 diff)
• HeuristicLab.Hive 3.3.dll.config (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab 3.3.exe.config

@@ -227 +227 @@
         <value>1</value>
       </setting>
+      <setting name="ExecutorQueueTimeout" serializeAs="String">
+        <value>00:00:20</value>
+      </setting>
     </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
   </userSettings>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/ExecutorQueue.cs

@@ -44 +44 @@
     /// <returns>the oldest ExecutorMessage Object</returns>
     public ExecutorMessage GetMessage() {
-      semaphore.WaitOne();
+      semaphore.WaitOne(Settings.Default.ExecutorQueueTimeout);
       lock (this) {
         if (queue.Count > 0) {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.Designer.cs

@@ -2 +2 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.235
+//     Runtime Version:4.0.30319.239
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -287 +287 @@
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("00:00:20")]
+        public global::System.TimeSpan ExecutorQueueTimeout {
+            get {
+                return ((global::System.TimeSpan)(this["ExecutorQueueTimeout"]));
+            }
+            set {
+                this["ExecutorQueueTimeout"] = value;
+            }
+        }
     }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.settings

@@ -69 +69 @@
       <Value Profile="(Default)">1</Value>
     </Setting>
+    <Setting Name="ExecutorQueueTimeout" Type="System.TimeSpan" Scope="User">
+      <Value Profile="(Default)">00:00:20</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/SlaveTask.cs

@@ -200 +200 @@
     private void MonitorExecutor() {
       while (executorMonitoringRun) {
-        //this blocks through the appdomain border, that's why the lease gets renewed
-        ExecutorMessage message = executor.ExecutorCommandQueue.GetMessage();
+        //this call goes through the appdomain border. We have to 
+        //poll so that the the lease gets renewed
+        ExecutorMessage message;
+        do {
+          message = executor.ExecutorCommandQueue.GetMessage();
+        } while (message == null);
 
         switch (message.MessageType) {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/app.config

@@ -81 +81 @@
         <value>1</value>
       </setting>
+      <setting name="ExecutorQueueTimeout" serializeAs="String">
+        <value>00:00:20</value>
+      </setting>
     </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
   </userSettings>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/app_ascheibe.config

@@ -81 +81 @@
         <value>1</value>
       </setting>
+      <setting name="ExecutorQueueTimeout" serializeAs="String">
+        <value>00:00:20</value>
+      </setting>
     </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
   </userSettings>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/app_f005pc.config

@@ -81 +81 @@
         <value>1</value>
       </setting>
+      <setting name="ExecutorQueueTimeout" serializeAs="String">
+        <value>00:00:20</value>
+      </setting>
     </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
   </userSettings>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/app_services.config

@@ -81 +81 @@
         <value>1</value>
       </setting>
+      <setting name="ExecutorQueueTimeout" serializeAs="String">
+        <value>00:00:20</value>
+      </setting>
     </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
   </userSettings>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.3.dll.config

@@ -121 +121 @@
         <value>1</value>
       </setting>
+      <setting name="ExecutorQueueTimeout" serializeAs="String">
+        <value>00:00:20</value>
+      </setting>
     </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
   </userSettings>