Changeset 11594 for branches/Breadcrumbs/HeuristicLab.Clients.Hive.Slave/3.3/Manager

Timestamp:

11/27/14 11:23:37 (10 years ago)

Author:

jkarder

Message:

#2116: merged r10041-r11593 from trunk into branch

Location:

branches/Breadcrumbs

Files:

• . (modified) (2 props)
• HeuristicLab.Clients.Hive.Slave/3.3/Manager/ConfigManager.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.3/Manager/EventLogManager.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.3/Manager/HeartbeatManager.cs (modified) (5 diffs)
• HeuristicLab.Clients.Hive.Slave/3.3/Manager/PluginManager.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.3/Manager/TaskManager.cs (modified) (8 diffs)

branches/Breadcrumbs

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
+HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -17 +19 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
-_ReSharper.HeuristicLab 3.3 Tests
-Google.ProtocolBuffers-2.4.1.473.dll

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
+HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -17 +19 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
-_ReSharper.HeuristicLab 3.3 Tests
-Google.ProtocolBuffers-2.4.1.473.dll

branches/Breadcrumbs/HeuristicLab.Clients.Hive.Slave/3.3/Manager/ConfigManager.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -117 +117 @@
       st.JobsFetched = SlaveStatusInfo.TasksFetched;
       st.JobsFailed = SlaveStatusInfo.TasksFailed;
-      st.ExceptionsOccured = SlaveStatusInfo.ExceptionsOccured;
 
       st.Jobs = jobManager.GetExecutionTimes().Select(x => new TaskStatus { TaskId = x.Key, ExecutionTime = x.Value }).ToList();

branches/Breadcrumbs/HeuristicLab.Clients.Hive.Slave/3.3/Manager/EventLogManager.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/Breadcrumbs/HeuristicLab.Clients.Hive.Slave/3.3/Manager/HeartbeatManager.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -24 +24 @@
 using System.Threading;
 using HeuristicLab.Clients.Hive.SlaveCore.Properties;
-using HeuristicLab.Common;
 
 namespace HeuristicLab.Clients.Hive.SlaveCore {
@@ -115 +114 @@
               if (msgs == null) {
                 SlaveClientCom.Instance.LogMessage("Error getting response from HB");
-                OnExceptionOccured(new Exception("Error getting response from HB"));
               } else {
                 SlaveClientCom.Instance.LogMessage("HB Response received (" + msgs.Count + "): ");
@@ -126 +124 @@
         catch (Exception e) {
           SlaveClientCom.Instance.LogMessage("Heartbeat thread failed: " + e.ToString());
-          OnExceptionOccured(e);
         }
         waitHandle.WaitOne(this.interval);
@@ -132 +129 @@
       SlaveClientCom.Instance.LogMessage("Heartbeat thread stopped");
     }
-
-    #region Eventhandler
-    public event EventHandler<EventArgs<Exception>> ExceptionOccured;
-    private void OnExceptionOccured(Exception e) {
-      var handler = ExceptionOccured;
-      if (handler != null) handler(this, new EventArgs<Exception>(e));
-    }
-    #endregion
   }
 }

branches/Breadcrumbs/HeuristicLab.Clients.Hive.Slave/3.3/Manager/PluginManager.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/Breadcrumbs/HeuristicLab.Clients.Hive.Slave/3.3/Manager/TaskManager.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -71 +71 @@
       try {
         if (slaveTasks.ContainsKey(task.Id)) {
-          SlaveStatusInfo.IncrementExceptionOccured();
+          SlaveStatusInfo.IncrementTasksFailed();
           throw new TaskAlreadyRunningException(task.Id);
         } else {
@@ -185 +185 @@
       slaveTask.TaskStopped += new EventHandler<EventArgs<Guid>>(slaveTask_TaskStopped);
       slaveTask.TaskFailed += new EventHandler<EventArgs<Guid, Exception>>(slaveTask_TaskFailed);
-      slaveTask.ExceptionOccured += new EventHandler<EventArgs<Guid, Exception>>(slaveTask_ExceptionOccured);
     }
 
@@ -193 +192 @@
       slaveTask.TaskStopped -= new EventHandler<EventArgs<Guid>>(slaveTask_TaskStopped);
       slaveTask.TaskFailed -= new EventHandler<EventArgs<Guid, Exception>>(slaveTask_TaskFailed);
-      slaveTask.ExceptionOccured -= new EventHandler<EventArgs<Guid, Exception>>(slaveTask_ExceptionOccured);
     }
 
@@ -220 +218 @@
       try {
         taskData = slaveTask.GetTaskData();
-        if (taskData == null) throw new SerializationException();
         SlaveStatusInfo.IncrementTasksFinished();
         OnTaskPaused(slaveTask, taskData);
@@ -243 +240 @@
       try {
         taskData = slaveTask.GetTaskData();
-        if (taskData == null) throw new SerializationException();
         SlaveStatusInfo.IncrementTasksFinished();
         OnTaskStopped(slaveTask, taskData);
@@ -266 +262 @@
       try {
         taskData = slaveTask.GetTaskData();
-        if (taskData == null) throw new SerializationException();
       }
       catch { /* taskData will be null */ }
       SlaveStatusInfo.IncrementTasksFailed();
       OnTaskFailed(slaveTask, taskData, e.Value2);
-    }
-
-    private void slaveTask_ExceptionOccured(object sender, EventArgs<Guid, Exception> e) {
-      SlaveTask slaveTask;
-      slaveTasksLocker.EnterUpgradeableReadLock();
-      try {
-        slaveTask = slaveTasks[e.Value];
-        RemoveSlaveTask(e.Value, slaveTask);
-      }
-      finally { slaveTasksLocker.ExitUpgradeableReadLock(); }
-
-      SlaveStatusInfo.IncrementExceptionOccured();
-      OnExceptionOccured(slaveTask, e.Value2);
     }
     #endregion
@@ -312 +294 @@
     }
 
-    public event EventHandler<EventArgs<SlaveTask, Exception>> ExceptionOccured;
-    private void OnExceptionOccured(SlaveTask slaveTask, Exception exception) {
-      var handler = ExceptionOccured;
-      if (handler != null) handler(this, new EventArgs<SlaveTask, Exception>(slaveTask, exception));
-    }
-
     public event EventHandler<EventArgs<SlaveTask>> TaskAborted;
     private void OnTaskAborted(SlaveTask slaveTask) {

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
+HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -17 +19 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
-_ReSharper.HeuristicLab 3.3 Tests
-Google.ProtocolBuffers-2.4.1.473.dll