Changeset 4772 for branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine

Timestamp:

11/11/10 15:30:03 (13 years ago)

Author:

cneumuel

Message:

#1260

• added LogServiceReader to display log for slave without writing to local files
• aborted jobs with childjobs now got back to state WaitForChildJob (instead of Offline)
• lifecyclemanager now knows about available plugins (does not yet work perfectly)

File:

• branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine/3.3/Executor.cs (modified) (8 diffs)

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine/3.3/Executor.cs

@@ -46 +46 @@
     }
     public MessageQueue Queue { get; set; }
-
-    public bool JobIsFinished { get; set; }
-
+    
     public ExecutionState ExecutionState {
       get {
@@ -87 +85 @@
       }
       catch (OutOfMemoryException e) {
-        JobIsFinished = true;
         this.currentException = e;
         Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.JobFailed, JobId));
@@ -98 +95 @@
       }
       catch (OutOfMemoryException e) {
-        JobIsFinished = true;
         this.currentException = e;
         Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.JobFailed, JobId));
@@ -108 +104 @@
       if ((ExecutionState == ExecutionState.Started) || (ExecutionState == ExecutionState.Paused)) {
         Job.Stop();
+      } else {
+        Job_JobStopped(this, EventArgs.Empty);
       }
     }
@@ -156 +154 @@
       };
 
-      JobIsFinished = true;
       Queue.AddMessage(new MessageContainerWithJob(MessageContainer.MessageType.PauseJob, this.JobId, serializedJob));
     }
@@ -171 +168 @@
 
     private void Job_JobStopped(object sender, EventArgs e) {
-      if (CurrentMessage == MessageContainer.MessageType.NoMessage) {
-        Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.FinishedJob, JobId));
-        JobIsFinished = true;
-      } else if (CurrentMessage == MessageContainer.MessageType.RequestSnapshot) {
+      if (CurrentMessage == MessageContainer.MessageType.RequestSnapshot) {
         Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.SnapshotReady, JobId));
       } else if (CurrentMessage == MessageContainer.MessageType.AbortJob) {
         Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.JobAborted, JobId));
+      } else {
+        Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.FinishedJob, JobId));
       }
     }
@@ -217 +213 @@
     public Executor() {
       CurrentMessage = MessageContainer.MessageType.NoMessage;
-      JobIsFinished = false;
-    }
-
-    #region IDisposable Members
+    }
 
     public void Dispose() {
@@ -227 +220 @@
       Job = null;
     }
-
-    #endregion
-
   }
 }