Changeset 4264 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core

Timestamp:

08/19/10 13:30:56 (14 years ago)

Author:

cneumuel

Message:

Split up "State" to "JobState" and "SlaveState" (#1159)

Location:

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

Files:

• DefaultScheduler.cs (modified) (2 diffs)
• Facades/ServerConsoleFacade.cs (modified) (1 diff)
• JobManager.cs (modified) (8 diffs)
• SlaveCommunicator.cs (modified) (17 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs

@@ -21 +21 @@
 
     public bool ExistsJobForSlave(HeartBeatData hbData) {
-      List<JobDto> allOfflineJobsForSlave = new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(State.Offline, hbData.FreeCores, hbData.FreeMemory, hbData.SlaveId));
+      List<JobDto> allOfflineJobsForSlave = new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(JobState.Offline, hbData.FreeCores, hbData.FreeMemory, hbData.SlaveId));
       return (allOfflineJobsForSlave != null && allOfflineJobsForSlave.Count > 0);
     }
@@ -31 +31 @@
         using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
           ClientDto slave = DaoLocator.ClientDao.FindById(slaveId);
-          LinkedList<JobDto> allOfflineJobsForSlave = new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(State.Offline, slave.NrOfFreeCores, slave.FreeMemory, slave.Id));
+          LinkedList<JobDto> allOfflineJobsForSlave = new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForSlave(JobState.Offline, slave.NrOfFreeCores, slave.FreeMemory, slave.Id));
           if (allOfflineJobsForSlave != null && allOfflineJobsForSlave.Count > 0) {
             jobToCalculate = allOfflineJobsForSlave.First.Value;
-            jobToCalculate.State = State.Calculating;
+            jobToCalculate.State = JobState.Calculating;
             jobToCalculate.Client = slave;
-            jobToCalculate.Client.State = State.Calculating;
+            jobToCalculate.Client.State = SlaveState.Calculating;
             jobToCalculate.DateCalculated = DateTime.Now;
             DaoLocator.JobDao.AssignSlaveToJob(slave.Id, jobToCalculate.Id);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ServerConsoleFacade.cs

@@ -108 +108 @@
     }
 
-    public ResponseList<JobDto> GetAllJobsWithFilter(State jobState, int offset, int count) {
+    public ResponseList<JobDto> GetAllJobsWithFilter(JobState jobState, int offset, int count) {
       using (contextFactory.GetContext(false)) {
         secMan.Authorize("AccessJobs", sessionID, Guid.Empty);

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

@@ -58 +58 @@
       List<JobDto> allJobs = new List<JobDto>(DaoLocator.JobDao.FindAll());
       foreach (JobDto curJob in allJobs) {
-        if (curJob.State != State.Calculating && curJob.State != State.Finished) {
+        if (curJob.State != JobState.Calculating && curJob.State != JobState.Finished) {
           DaoLocator.JobDao.SetJobOffline(curJob);
         }
@@ -86 +86 @@
     }
 
-    public ResponseList<JobDto> GetAllJobsWithFilter(State jobState, int offset, int count) {
+    public ResponseList<JobDto> GetAllJobsWithFilter(JobState jobState, int offset, int count) {
       ResponseList<JobDto> response = new ResponseList<JobDto>();
       response.List = new List<JobDto>(DaoLocator.JobDao.FindWithLimitations(jobState, offset, count));
@@ -153 +153 @@
 
       if (job != null && job.JobInfo != null) {
-        if (job.JobInfo.State != State.Offline) {
+        if (job.JobInfo.State != JobState.Offline) {
           response.StatusMessage = ResponseStatus.AddNewJob_JobStateMustBeOffline;
           return response;
@@ -222 +222 @@
 
       //if it's a snapshot but the result hasn't reached the server yet...
-      if (snapshot && (job.State == State.RequestSnapshot || job.State == State.RequestSnapshotSent)) {
+      if (snapshot && (job.State == JobState.SnapshotRequested || job.State == JobState.SnapshotSent)) {
         response.StatusMessage = ResponseStatus.GetLastSerializedResult_JobResultNotYetThere;
 
@@ -229 +229 @@
 
       //if it's NOT a snapshot, NEITHER request NOR is it finished
-      if (!requested && !snapshot && job.State != State.Finished) {
+      if (!requested && !snapshot && job.State != JobState.Finished) {
         response.StatusMessage = ResponseStatus.GetLastSerializedResult_JobResultNotYetThere;
 
@@ -248 +248 @@
 
       JobDto job = DaoLocator.JobDao.FindById(jobId);
-      if (job.State == State.RequestSnapshot || job.State == State.RequestSnapshotSent) {
+      if (job.State == JobState.SnapshotRequested || job.State == JobState.SnapshotSent) {
         response.StatusMessage = ResponseStatus.RequestSnapshot_SnapshotAlreadyRequested;
         return response;
       }
-      if (job.State != State.Calculating) {
+      if (job.State != JobState.Calculating) {
         response.StatusMessage = ResponseStatus.RequestSnapshot_JobIsNotBeeingCalculated;
         return response;
       }
       // job is in correct state
-      job.State = State.RequestSnapshot;
+      job.State = JobState.SnapshotRequested;
       DaoLocator.JobDao.Update(job);
 
@@ -275 +275 @@
         return response; // no commit needed
       }
-      if (job.State == State.Abort) {
+      if (job.State == JobState.Aborted) {
         //response.Success = true;
         response.StatusMessage = ResponseStatus.AbortJob_AbortAlreadyRequested;
         return response; // no commit needed
       }
-      if (job.State != State.Calculating && job.State != State.RequestSnapshot && job.State != State.RequestSnapshotSent) {
+      if (job.State != JobState.Calculating && job.State != JobState.SnapshotRequested && job.State != JobState.SnapshotSent) {
         //response.Success = false;
         response.StatusMessage = ResponseStatus.AbortJob_JobIsNotBeeingCalculated;
@@ -286 +286 @@
       }
       // job is in correct state
-      job.State = State.Abort;
+      job.State = JobState.Aborted;
       DaoLocator.JobDao.Update(job);
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveCommunicator.cs

@@ -83 +83 @@
 
         foreach (ClientDto client in allClients) {
-          if (client.State != State.Offline && client.State != State.NullState) {
+          if (client.State != SlaveState.Offline && client.State != SlaveState.NullState) {
             heartbeatLock.EnterUpgradeableReadLock();
 
@@ -89 +89 @@
               Logger.Info("Client " + client.Id +
                               " wasn't offline but hasn't sent heartbeats - setting offline");
-              client.State = State.Offline;
+              client.State = SlaveState.Offline;
               DaoLocator.ClientDao.Update(client);
               Logger.Info("Client " + client.Id +
@@ -114 +114 @@
                 Logger.Debug("setting client offline");
                 // client must be set offline
-                client.State = State.Offline;
+                client.State = SlaveState.Offline;
 
                 //clientAdapter.Update(client);
@@ -147 +147 @@
 
     private void CheckForPendingJobs() {
-      IList<JobDto> pendingJobsInDB = new List<JobDto>(DaoLocator.JobDao.GetJobsByState(State.Pending));
+      IList<JobDto> pendingJobsInDB = new List<JobDto>(DaoLocator.JobDao.GetJobsByState(JobState.Pending));
 
       foreach (JobDto currJob in pendingJobsInDB) {
@@ -153 +153 @@
           if (pendingJobs.ContainsKey(currJob.Id)) {
             if (pendingJobs[currJob.Id] <= 0) {
-              currJob.State = State.Offline;
+              currJob.State = JobState.Offline;
               DaoLocator.JobDao.Update(currJob);
             } else {
@@ -186 +186 @@
       //Really set offline? 
       //Reconnect issues with the currently calculating jobs
-      slaveInfo.State = State.Idle;
+      slaveInfo.State = SlaveState.Idle;
       slaveInfo.CalendarSyncStatus = dbClient != null ? dbClient.CalendarSyncStatus : CalendarState.NotAllowedToFetch;
 
@@ -255 +255 @@
       Logger.Debug("END Finished Client Fetching");
       // check if the client is logged in
-      if (client.State == State.Offline || client.State == State.NullState) {
+      if (client.State == SlaveState.Offline || client.State == SlaveState.NullState) {
         // response.Success = false;
         response.StatusMessage = ResponseStatus.ProcessHeartBeat_UserNotLoggedIn;
@@ -359 +359 @@
             response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
             Logger.Error("There is no job calculated by this user " + hbData.SlaveId + " Job: " + curJob);
-          } else if (curJob.State == State.Abort) {
+          } else if (curJob.State == JobState.Aborted) {
             // a request to abort the job has been set
             response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
-            curJob.State = State.Finished;
+            curJob.State = JobState.Finished;
           } else {
             // save job progress
             curJob.Percentage = jobProgress.Value;
 
-            if (curJob.State == State.RequestSnapshot) {
+            if (curJob.State == JobState.SnapshotRequested) {
               // a request for a snapshot has been set
               response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.RequestSnapshot, curJob.Id));
-              curJob.State = State.RequestSnapshotSent;
+              curJob.State = JobState.SnapshotSent;
             }
           }
@@ -394 +394 @@
                 Logger.Error("Job TTL reached Zero, Job gets removed: " + currJob + " and set back to offline. User that sucks: " + currJob.Client);
 
-                currJob.State = State.Offline;
+                currJob.State = JobState.Offline;
                 DaoLocator.JobDao.Update(currJob);
 
@@ -403 +403 @@
             } else {
               Logger.Error("Job ID wasn't with the heartbeats:  " + currJob);
-              currJob.State = State.Offline;
+              currJob.State = JobState.Offline;
               DaoLocator.JobDao.Update(currJob);
             }
@@ -516 +516 @@
         return response;
       }
-      if (job.JobInfo.State == State.Abort) {
+      if (job.JobInfo.State == JobState.Aborted) {
         //response.Success = false;
         response.StatusMessage = ResponseStatus.ProcessJobResult_JobAborted;
@@ -545 +545 @@
         return response;
       }
-      if (job.JobInfo.State == State.Finished) {
+      if (job.JobInfo.State == JobState.Finished) {
         response.StatusMessage = ResponseStatus.Ok;
         response.JobId = jobId;
@@ -555 +555 @@
       }
       //Todo: RequestsnapshotSent => calculating?
-      if (job.JobInfo.State == State.RequestSnapshotSent) {
-        job.JobInfo.State = State.Calculating;
-      }
-      if (job.JobInfo.State != State.Calculating && job.JobInfo.State != State.Pending) {
+      if (job.JobInfo.State == JobState.SnapshotSent) {
+        job.JobInfo.State = JobState.Calculating;
+      }
+      if (job.JobInfo.State != JobState.Calculating && job.JobInfo.State != JobState.Pending) {
         //response.Success = false;
         response.StatusMessage = ResponseStatus.ProcessJobResult_InvalidJobState;
@@ -571 +571 @@
 
       if (!string.IsNullOrEmpty(exception)) {
-        job.JobInfo.State = State.Failed;
+        job.JobInfo.State = JobState.Failed;
         job.JobInfo.Exception = exception;
         job.JobInfo.DateFinished = DateTime.Now;
       } else if (finished) {
-        job.JobInfo.State = State.Finished;
+        job.JobInfo.State = JobState.Finished;
         job.JobInfo.DateFinished = DateTime.Now;
       }
@@ -638 +638 @@
         return response;
       }
-      if (client.State == State.Calculating) {
+      if (client.State == SlaveState.Calculating) {
         // check wich job the client was calculating and reset it
         IEnumerable<JobDto> jobsOfClient = DaoLocator.JobDao.FindActiveJobsOfSlave(client);
         foreach (JobDto job in jobsOfClient) {
-          if (job.State != State.Finished)
+          if (job.State != JobState.Finished)
             DaoLocator.JobDao.SetJobOffline(job);
         }
       }
 
-      client.State = State.Offline;
+      client.State = SlaveState.Offline;
       DaoLocator.ClientDao.Update(client);
 
@@ -668 +668 @@
         return response;
       }
-      if (job.State == State.Finished) {
+      if (job.State == JobState.Finished) {
         //response.Success = true;
         response.StatusMessage = ResponseStatus.IsJobStillNeeded_JobAlreadyFinished;
@@ -674 +674 @@
         return response;
       }
-      job.State = State.Pending;
+      job.State = JobState.Pending;
       lock (pendingJobs) {
         pendingJobs.Add(job.Id, PENDING_TIMEOUT);