Changeset 4423 for branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.cs

Timestamp:

09/17/10 10:26:55 (14 years ago)

Author:

cneumuel

Message:

• Refactored HL.Hive.Experiment. JobItems are not called HiveJobs and OptimizerJobs do not contain a hierarchy anymore.
• Dynamic generation of jobs on a slave are not reflected on the client user interface.
• Optimizer-Trees are now strictly synchronized with the HiveJob-Trees (also the ComputeInParallel property is taken into account when the Child HiveJobs are created)
• Improved the way a class can report progress and lock the UI (IProgressReporter, IProgress, Progress, ProgressView)
• Changes were made to the config-files, so that server and clients work with blade12.hpc.fh-hagenberg.at
• Lots of small changes and bugfixes

File:

• branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.cs (modified) (13 diffs)

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.cs

@@ -50 +50 @@
       lifecycleManager = ServiceLocator.GetLifecycleManager();
 
-      lifecycleManager.RegisterStartup(new EventHandler(lifecycleManager_OnStartup));
-      lifecycleManager.RegisterShutdown(new EventHandler(lifecycleManager_OnShutdown));
+      lifecycleManager.Started += new EventHandler(lifecycleManager_Started);
+      lifecycleManager.Stopped += new EventHandler(lifecycleManager_Stopped);
     }
 
@@ -59 +59 @@
       List<JobDto> allJobs = new List<JobDto>(DaoLocator.JobDao.FindAll());
       foreach (JobDto curJob in allJobs) {
-        if (curJob.State != JobState.Calculating && curJob.State != JobState.Finished) {
+        if (curJob.State != JobState.Calculating &&
+            curJob.State != JobState.Finished &&
+            curJob.State != JobState.Aborted &&
+            curJob.State != JobState.Failed &&
+            curJob.State != JobState.WaitForChildJobs) {
           DaoLocator.JobDao.SetJobOffline(curJob);
         }
@@ -65 +69 @@
     }
 
-    private void lifecycleManager_OnStartup(object sender, EventArgs e) {
+    private void lifecycleManager_Started(object sender, EventArgs e) {
       Logger.Info("Startup Event Fired, Checking DB for consistency");
       CheckForDeadJobs();
@@ -71 +75 @@
     }
 
-    private void lifecycleManager_OnShutdown(object sender, EventArgs e) {
+    private void lifecycleManager_Stopped(object sender, EventArgs e) {
       Logger.Info("Startup Event Fired, Checking DB for consistency");
       CheckForDeadJobs();
@@ -155 +159 @@
 
       if (job != null && job.JobInfo != null) {
-        if (job.JobInfo.State != JobState.Offline) {
-          response.StatusMessage = ResponseStatus.AddNewJob_JobStateMustBeOffline;
+        // only Offline and WaitForChildJobs are allowed
+        if (job.JobInfo.State != JobState.Offline && job.JobInfo.State != JobState.WaitForChildJobs) {
+          response.StatusMessage = ResponseStatus.AddNewJob_InvalidJobState;
           return response;
         }
@@ -228 +233 @@
       response.Obj.JobInfo = job;
 
-      response.Obj.SerializedJobData = DaoLocator.JobDao.GetBinaryJobFile(jobId);
+      if (job != null) {
+        response.Obj.SerializedJobData = DaoLocator.JobDao.GetBinaryJobFile(jobId);
+      } else {
+        response.StatusMessage = ResponseStatus.GetLastSerializedResult_JobDoesNotExist;
+      }
 
       return response;
@@ -285 +294 @@
         //response.Success = true;
         response.StatusMessage = ResponseStatus.AbortJob_AbortAlreadyRequested;
-        return response; // no commit needed
-      }
-      if (job.State != JobState.Calculating && job.State != JobState.SnapshotRequested && job.State != JobState.SnapshotSent) {
-        //response.Success = false;
-        response.StatusMessage = ResponseStatus.AbortJob_JobIsNotBeeingCalculated;
         return response; // no commit needed
       }
@@ -315 +319 @@
           DateFinished = job.DateFinished,
           Exception = job.Exception,
-          Percentage = job.Percentage
+          ExecutionTime = job.ExecutionTime
         });
       }
@@ -352 +356 @@
             DateFinished = job.DateFinished,
             Exception = job.Exception,
-            Percentage = job.Percentage,
-            ParentJobId = job.ParentJob != null ? new Nullable<Guid>(job.ParentJob.Id) : null
+            ExecutionTime = job.ExecutionTime,
+            ParentJobId = job.ParentJobId
           });
         }
       }
-      
+
       response.Obj = jobResultList;
       return response;
@@ -365 +369 @@
       JobDto parentJob = DaoLocator.JobDao.FindById(parentJobId);
 
-      serializedJob.JobInfo.ParentJob = parentJob;
+      serializedJob.JobInfo.ParentJobId = parentJob.Id;
       serializedJob.JobInfo.UserId = parentJob.UserId;
       serializedJob.JobInfo.AssignedResourceIds = parentJob.AssignedResourceIds;
@@ -376 +380 @@
 
       jobDto.State = serializedJob.JobInfo.State;
-      jobDto.Percentage = serializedJob.JobInfo.Percentage;
-      
+      jobDto.ExecutionTime = serializedJob.JobInfo.ExecutionTime;
 
       DaoLocator.JobDao.SetBinaryJobFile(serializedJob.JobInfo.Id, serializedJob.SerializedJobData);
@@ -390 +393 @@
     }
 
+
+    public ResponseObject<HiveExperimentDtoList> GetHiveExperiments() {
+      ResponseObject<HiveExperimentDtoList> response = new ResponseObject<HiveExperimentDtoList>();
+      IEnumerable<HiveExperimentDto> hiveExperiments = DaoLocator.HiveExperimentDao.FindAllByUserId(ServiceLocator.GetAuthorizationManager().UserId);
+      response.Obj = new HiveExperimentDtoList(hiveExperiments);
+      response.StatusMessage = ResponseStatus.Ok;
+      return response;
+    }
+
+    public ResponseObject<HiveExperimentDto> UpdateHiveExperiment(HiveExperimentDto hiveExperimentDto) {
+      ResponseObject<HiveExperimentDto> response = new ResponseObject<HiveExperimentDto>();
+      if (hiveExperimentDto.Id == Guid.Empty) {
+        response.Obj = DaoLocator.HiveExperimentDao.Insert(hiveExperimentDto);
+      } else {
+        DaoLocator.HiveExperimentDao.Update(hiveExperimentDto);
+        response.Obj = hiveExperimentDto;
+      }
+      response.StatusMessage = ResponseStatus.Ok;
+      return response;
+    }
+
+    public Response DeleteHiveExperiment(Guid hiveExperimentId) {
+      Response response = new Response();
+      try {
+        DaoLocator.HiveExperimentDao.Delete(hiveExperimentId);
+      }
+      catch (Exception) {
+        response.StatusMessage = ResponseStatus.DeleteHiveExperiment_Failed;
+      }
+      return response;
+    }
+
+    public Response DeleteChildJobs(Guid jobId) {
+      Response response = new Response();
+      try {
+        IEnumerable<JobDto> childs = DaoLocator.JobDao.FindJobsByParentId(jobId, true);
+        foreach (JobDto childJob in childs) {
+          DaoLocator.JobDao.Delete(childJob.Id);
+        }
+      }
+      catch (Exception) {
+        response.StatusMessage = ResponseStatus.DeleteChildJobs_Failed;
+      }
+      return response;
+    }
+
     #endregion
 
@@ -420 +469 @@
 
 
-    
-
   }
 }