Changeset 4119 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core

Timestamp:

07/28/10 17:48:10 (14 years ago)

Author:

cneumuel

Message:

HiveExperiment is now able to send IOptimizers of an Experiment and receive the calculated result (#1115)

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3

Files:

• Core.cs (modified) (5 diffs)
• Heartbeat.cs (modified) (4 diffs)
• HeuristicLab.Hive.Client.Core-3.3.csproj (modified) (1 diff)
• PluginCache.cs (modified) (1 diff)
• Properties/AssemblyInfo.cs (modified) (1 diff)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/Core.cs

@@ -45 +45 @@
 using HeuristicLab.Hive.Client.Core.JobStorage;
 using HeuristicLab.Tracing;
+using HeuristicLab.Core;
 
 namespace HeuristicLab.Hive.Client.Core {
@@ -98 +99 @@
       if (cc.IPAdress != String.Empty && cc.Port != 0)
         wcfService.SetIPAndPort(cc.IPAdress, cc.Port);
-
-      if (!UptimeManager.Instance.CalendarAvailable || UptimeManager.Instance.IsOnline())
-        wcfService.Connect();
 
       //Initialize the heartbeat
@@ -249 +247 @@
         if (WcfService.Instance.ConnState == NetworkEnum.WcfConnState.Loggedin) {
           Logger.Info("Sending the finished job with id: " + jId);
-          wcfService.StoreFinishedJobResultAsync(ConfigManager.Instance.GetClientInfo().Id,
-            jId,
-            sJob,
-            1,
-            null,
-            true);
+          wcfService.StoreFinishedJobResultAsync(ConfigManager.Instance.GetClientInfo().Id, jId, sJob, 1.0, null, true);
         } else {
           Logger.Info("Storing the finished job with id: " + jId + " to hdd");
@@ -465 +458 @@
 
       foreach (KeyValuePair<Guid, Executor> execKVP in engines) {
-        if (!execKVP.Value.Running && execKVP.Value.CurrentMessage == MessageContainer.MessageType.NoMessage) {
+        if (execKVP.Value.ExecutionState != ExecutionState.Started && execKVP.Value.CurrentMessage == MessageContainer.MessageType.NoMessage) {
           Logger.Info("Checking for JobId: " + execKVP.Value.JobId);
           Thread finThread = new Thread(new ParameterizedThreadStart(GetFinishedJob));
@@ -513 +506 @@
   }
 
- 
+
 }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/Heartbeat.cs

@@ -43 +43 @@
     private bool offline;
 
-    public double Interval { get; set; }    
+    public double Interval { get; set; }
     private Timer heartbeatTimer = null;
-        
+
+    private static object locker = new object();
+
     public Heartbeat() {
       Interval = 100;
@@ -51 +53 @@
 
     public Heartbeat(double interval) {
-      Interval = interval;      
+      Interval = interval;
     }
 
@@ -74 +76 @@
     /// <param name="sender"></param>
     /// <param name="e"></param>
-    void heartbeatTimer_Elapsed(object sender, ElapsedEventArgs e) {      
-      ClientDto info = ConfigManager.Instance.GetClientInfo();      
+    void heartbeatTimer_Elapsed(object sender, ElapsedEventArgs e) {
+      lock (locker) {
+        // check if cwfService is disconnected for any reason (should happen at first heartbeat)
+        // [chn] TODO: Client should always send heartbeats. when calendar disallows he should tell the server he does not want to compute anything
+        if (wcfService.ConnState == NetworkEnum.WcfConnState.Disconnected &&
+          (!UptimeManager.Instance.CalendarAvailable || UptimeManager.Instance.IsOnline())) {
+          wcfService.Connect();
+        }
 
-      PerformanceCounter counter = new PerformanceCounter("Memory", "Available Bytes", true);
-      int mb = (int)(counter.NextValue() / 1024 / 1024);
+        ClientDto info = ConfigManager.Instance.GetClientInfo();
 
-      HeartBeatData heartBeatData = new HeartBeatData {
-        ClientId = info.Id,
-        FreeCores = info.NrOfCores - ConfigManager.Instance.GetUsedCores(),
-        FreeMemory = mb,
-        JobProgress = ConfigManager.Instance.GetProgressOfAllJobs()      
-      };
-       
-      DateTime lastFullHour = DateTime.Parse(DateTime.Now.Hour.ToString() + ":00");
-      TimeSpan span = DateTime.Now - lastFullHour;
-      if (span.TotalSeconds < (Interval/1000)) {
-        if (UptimeManager.Instance.IsOnline() && UptimeManager.Instance.CalendarAvailable) {
-          //That's quiet simple: Just reconnect and you're good for new jobs
-          if (wcfService.ConnState != NetworkEnum.WcfConnState.Loggedin) {
-            Logger.Info("Client goes online according to timetable");
-            wcfService.Connect();
+        PerformanceCounter counter = new PerformanceCounter("Memory", "Available Bytes", true);
+        int mb = (int)(counter.NextValue() / 1024 / 1024);
+
+        HeartBeatData heartBeatData = new HeartBeatData {
+          ClientId = info.Id,
+          FreeCores = info.NrOfCores - ConfigManager.Instance.GetUsedCores(),
+          FreeMemory = mb,
+          JobProgress = ConfigManager.Instance.GetProgressOfAllJobs()
+        };
+
+        DateTime lastFullHour = DateTime.Parse(DateTime.Now.Hour.ToString() + ":00");
+        TimeSpan span = DateTime.Now - lastFullHour;
+        if (span.TotalSeconds < (Interval / 1000)) {
+          if (UptimeManager.Instance.IsOnline() && UptimeManager.Instance.CalendarAvailable) {
+            //That's quiet simple: Just reconnect and you're good for new jobs
+            if (wcfService.ConnState != NetworkEnum.WcfConnState.Loggedin) {
+              Logger.Info("Client goes online according to timetable");
+              wcfService.Connect();
+            }
+          } else {
+            //We have quit a lot of work to do here: snapshot all jobs, submit them back, then disconnect and then pray to god that nothing goes wrong
+            MessageQueue.GetInstance().AddMessage(MessageContainer.MessageType.UptimeLimitDisconnect);
           }
-        } else {
-          //We have quit a lot of work to do here: snapshot all jobs, submit them back, then disconnect and then pray to god that nothing goes wrong
-          MessageQueue.GetInstance().AddMessage(MessageContainer.MessageType.UptimeLimitDisconnect);                  
-        }        
-      }
-      if (wcfService.ConnState == NetworkEnum.WcfConnState.Failed) {
-        wcfService.Connect();
-      } else if (wcfService.ConnState == NetworkEnum.WcfConnState.Loggedin) {
-        Logger.Debug("Sending Heartbeat: " + heartBeatData);        
-        wcfService.ProcessHeartBeatAsync(heartBeatData);
+        }
+        if (wcfService.ConnState == NetworkEnum.WcfConnState.Failed) {
+          wcfService.Connect();
+        } else if (wcfService.ConnState == NetworkEnum.WcfConnState.Loggedin) {
+          Logger.Debug("Sending Heartbeat: " + heartBeatData);
+          wcfService.ProcessHeartBeatAsync(heartBeatData);
+        }
       }
     }
@@ -111 +122 @@
     void wcfService_ProcessHeartBeatCompleted(object sender, ProcessHeartBeatCompletedEventArgs e) {
       Logger.Debug("Heartbeat received");
-      e.Result.ActionRequest.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));      
+      e.Result.ActionRequest.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));
     }
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/HeuristicLab.Hive.Client.Core-3.3.csproj

@@ -76 +76 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/PluginCache.cs

@@ -42 +42 @@
         //we MAY run in problems here - if there is a plugin twice in requests, there may be added two different versions of the plugin
         foreach (CachedHivePluginInfoDto cache in pluginCache) {
-          if (info.Name.Equals(cache.Name) && info.Version.Equals(cache.Version) && info.BuildDate <= cache.BuildDate) {
+          if (info.Name.Equals(cache.Name) && info.Version.Equals(cache.Version)) {
             Logger.Debug("Found plugin " + info.Name + ", " + info.Version);
             neededPlugins.Add(cache);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/Properties/AssemblyInfo.cs

@@ -57 +57 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.0.4111")]
-[assembly: AssemblyFileVersion("3.3.0.4111")]
-[assembly: AssemblyBuildDate("2010/07/27 18:31:47")]
+[assembly: AssemblyVersion("3.3.0.4116")]
+[assembly: AssemblyFileVersion("3.3.0.4116")]
+[assembly: AssemblyBuildDate("2010/07/28 17:42:03")]