Changeset 7857 for trunk/sources/HeuristicLab.Services.Hive

Timestamp:

05/21/12 15:12:15 (12 years ago)

Author:

jkarder

Message:

#1854:

• integrated marker attribute (IsDisposable) into the Hive components
• adjusted database scheme
• extended administration user interface

Location:

trunk/sources/HeuristicLab.Services.Hive/3.3

Files:

• Convert.cs (modified) (2 diffs)
• DataTransfer/Slave.cs (modified) (1 diff)
• Manager/EventManager.cs (modified) (2 diffs)
• Properties/Settings.Designer.cs (modified) (2 diffs)
• Properties/Settings.settings (modified) (1 diff)
• app.config (modified) (1 diff)

trunk/sources/HeuristicLab.Services.Hive/3.3/Convert.cs

@@ -218 +218 @@
         LastHeartbeat = source.LastHeartbeat,
         CpuUtilization = source.CpuUtilization,
-        HbInterval = source.HbInterval
+        HbInterval = source.HbInterval,
+        IsDisposable = source.IsDisposable
       };
     }
@@ -243 +244 @@
         target.CpuUtilization = source.CpuUtilization;
         target.HbInterval = source.HbInterval;
+        target.IsDisposable = source.IsDisposable;
       }
     }

trunk/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Slave.cs

@@ -53 +53 @@
     [DataMember]
     public double CpuUtilization { get; set; }
+    [DataMember]
+    public bool IsDisposable { get; set; }
 
     public Slave() {

trunk/sources/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

@@ -49 +49 @@
         SetTimeoutSlavesOffline();
         SetTimeoutTasksWaiting();
+        DeleteObsoleteSlaves();
       }, true);
 
@@ -116 +117 @@
       }
     }
+
+    /// <summary>
+    /// Searches for slaves that are disposable and deletes them if they were offline for too long
+    /// </summary>
+    private void DeleteObsoleteSlaves() {
+      var slaves = dao.GetSlaves(x => x.IsDisposable && x.SlaveState == SlaveState.Offline && (DateTime.Now - x.LastHeartbeat) > HeuristicLab.Services.Hive.Properties.Settings.Default.SweepInterval);
+      foreach (DT.Slave slave in slaves) dao.DeleteSlave(slave.Id);
+    }
   }
 }

trunk/sources/HeuristicLab.Services.Hive/3.3/Properties/Settings.Designer.cs

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

trunk/sources/HeuristicLab.Services.Hive/3.3/Properties/Settings.settings

@@ -18 +18 @@
       <Value Profile="(Default)">00:03:00</Value>
     </Setting>
+    <Setting Name="SweepInterval" Type="System.TimeSpan" Scope="Application">
+      <Value Profile="(Default)">3.00:00:00</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

trunk/sources/HeuristicLab.Services.Hive/3.3/app.config

@@ -23 +23 @@
                 <value>00:03:00</value>
             </setting>
+            <setting name="SweepInterval" serializeAs="String">
+                <value>3.00:00:00</value>
+            </setting>
         </HeuristicLab.Services.Hive.Properties.Settings>
     </applicationSettings>