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

Timestamp:

07/27/10 18:36:36 (14 years ago)

Author:

cneumuel

Message:

worked on HiveExperiment (#1115)

Location:

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

Files:

• ClientCommunicator.cs (modified) (17 diffs)
• DbTestApp.cs (modified) (4 diffs)
• DefaultScheduler.cs (modified) (2 diffs)
• JobManager.cs (modified) (8 diffs)
• Properties/AssemblyInfo.cs (modified) (1 diff)

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

@@ -82 +82 @@
 
         foreach (ClientDto client in allClients) {
-          if (client.State != State.offline && client.State != State.nullState) {
+          if (client.State != State.Offline && client.State != State.NullState) {
             heartbeatLock.EnterUpgradeableReadLock();
 
@@ -88 +88 @@
               Logger.Info("Client " + client.Id +
                               " wasn't offline but hasn't sent heartbeats - setting offline");
-              client.State = State.offline;
+              client.State = State.Offline;
               DaoLocator.ClientDao.Update(client);
               Logger.Info("Client " + client.Id +
@@ -113 +113 @@
                 Logger.Debug("setting client offline");
                 // client must be set offline
-                client.State = State.offline;
+                client.State = State.Offline;
 
                 //clientAdapter.Update(client);
@@ -146 +146 @@
 
     private void CheckForPendingJobs() {
-      IList<JobDto> pendingJobsInDB = new List<JobDto>(DaoLocator.JobDao.GetJobsByState(State.pending));
+      IList<JobDto> pendingJobsInDB = new List<JobDto>(DaoLocator.JobDao.GetJobsByState(State.Pending));
 
       foreach (JobDto currJob in pendingJobsInDB) {
@@ -152 +152 @@
           if (pendingJobs.ContainsKey(currJob.Id)) {
             if (pendingJobs[currJob.Id] <= 0) {
-              currJob.State = State.offline;
+              currJob.State = State.Offline;
               DaoLocator.JobDao.Update(currJob);
             } else {
@@ -185 +185 @@
       //Really set offline? 
       //Reconnect issues with the currently calculating jobs
-      clientInfo.State = State.idle;
+      clientInfo.State = State.Idle;
       clientInfo.CalendarSyncStatus = dbClient != null ? dbClient.CalendarSyncStatus : CalendarState.NotAllowedToFetch;
 
@@ -258 +258 @@
       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 == State.Offline || client.State == State.NullState) {
         response.Success = false;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_USER_NOT_LOGGED_IN;
@@ -341 +341 @@
             response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
             Logger.Error("There is no job calculated by this user " + hbData.ClientId + " Job: " + curJob);
-          } else if (curJob.State == State.abort) {
+          } else if (curJob.State == State.Abort) {
             // 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 = State.Finished;
           } else {
             // save job progress
             curJob.Percentage = jobProgress.Value;
 
-            if (curJob.State == State.requestSnapshot) {
+            if (curJob.State == State.RequestSnapshot) {
               // a request for a snapshot has been set
               response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.RequestSnapshot, curJob.Id));
-              curJob.State = State.requestSnapshotSent;
+              curJob.State = State.RequestSnapshotSent;
             }
           }
@@ -376 +376 @@
                 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 = State.Offline;
                 DaoLocator.JobDao.Update(currJob);
 
@@ -385 +385 @@
             } else {
               Logger.Error("Job ID wasn't with the heartbeats:  " + currJob);
-              currJob.State = State.offline;
+              currJob.State = State.Offline;
               DaoLocator.JobDao.Update(currJob);
             }
@@ -516 +516 @@
         return response;
       }
-      if (job.JobInfo.State == State.abort) {
+      if (job.JobInfo.State == State.Abort) {
         response.Success = false;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_WAS_ABORTED;
@@ -545 +545 @@
         return response;
       }
-      if (job.JobInfo.State == State.finished) {
+      if (job.JobInfo.State == State.Finished) {
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED;
@@ -556 +556 @@
       }
       //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 == State.RequestSnapshotSent) {
+        job.JobInfo.State = State.Calculating;
+      }
+      if (job.JobInfo.State != State.Calculating &&
+        job.JobInfo.State != State.Pending) {
         response.Success = false;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_WRONG_JOB_STATE;
@@ -573 +573 @@
 
       if (finished) {
-        job.JobInfo.State = State.finished;
+        job.JobInfo.State = State.Finished;
         job.JobInfo.DateFinished = DateTime.Now;
       }
@@ -637 +637 @@
         return response;
       }
-      if (client.State == State.calculating) {
+      if (client.State == State.Calculating) {
         // check wich job the client was calculating and reset it
         IEnumerable<JobDto> jobsOfClient = DaoLocator.JobDao.FindActiveJobsOfClient(client);
         foreach (JobDto job in jobsOfClient) {
-          if (job.State != State.finished)
+          if (job.State != State.Finished)
             DaoLocator.JobDao.SetJobOffline(job);
         }
       }
 
-      client.State = State.offline;
+      client.State = State.Offline;
       DaoLocator.ClientDao.Update(client);
 
@@ -670 +670 @@
         return response;
       }
-      if (job.State == State.finished) {
+      if (job.State == State.Finished) {
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_ALLREADY_FINISHED;
@@ -676 +676 @@
         return response;
       }
-      job.State = State.pending;
+      job.State = State.Pending;
       lock (pendingJobs) {
         pendingJobs.Add(job.Id, PENDING_TIMEOUT);

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

@@ -123 +123 @@
       c1.NrOfFreeCores = 2;
       c1.CpuSpeedPerCore = 2500;
-      c1.State = State.idle;
+      c1.State = State.Idle;
       c1 = clientDao.Insert(c1);
 
@@ -137 +137 @@
       c2.NrOfFreeCores = 1;
       c2.CpuSpeedPerCore = 4000;
-      c2.State = State.idle;
+      c2.State = State.Idle;
       c2 = clientDao.Insert(c2);
 
@@ -159 +159 @@
         Percentage = 0,
         Priority = 1,
-        State = State.offline
+        State = State.Offline
       };
 
@@ -204 +204 @@
         client.NrOfFreeCores = 2;
         client.CpuSpeedPerCore = 2500;
-        client.State = State.idle;
+        client.State = State.Idle;
         client = clientDao.Insert(client);
         cgd.AddRessourceToClientGroup(client.Id, mg.Id);

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

@@ -26 +26 @@
     public bool ExistsJobForClient(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
       List<JobDto> allOfflineJobsForClient =
-        new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.offline, hbData.FreeCores, hbData.FreeMemory,
+        new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.Offline, hbData.FreeCores, hbData.FreeMemory,
                                                                     hbData.ClientId));
       return (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0);
@@ -38 +38 @@
         ClientDto client = DaoLocator.ClientDao.FindById(clientId);
         LinkedList<JobDto> allOfflineJobsForClient =
-          new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.offline, client.NrOfFreeCores,
+          new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.Offline, client.NrOfFreeCores,
                                                                             client.FreeMemory, client.Id));        
         if (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0) {
           jobToCalculate = allOfflineJobsForClient.First.Value;
-          jobToCalculate.State = State.calculating;
+          jobToCalculate.State = State.Calculating;
           jobToCalculate.Client = client;
-          jobToCalculate.Client.State = State.calculating;
+          jobToCalculate.Client.State = State.Calculating;
           jobToCalculate.DateCalculated = DateTime.Now;
           DaoLocator.JobDao.AssignClientToJob(client.Id, jobToCalculate.Id);

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

@@ -66 +66 @@
         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 != State.Calculating && curJob.State != State.Finished) {
             DaoLocator.JobDao.SetJobOffline(curJob);
           }
@@ -170 +170 @@
 
       if (job != null && job.JobInfo != null) {
-        if (job.JobInfo.State != State.offline) {
+        if (job.JobInfo.State != State.Offline) {
           response.Success = false;
           response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOBSTATE_MUST_BE_OFFLINE;
@@ -242 +242 @@
 
       //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 == State.RequestSnapshot || job.State == State.RequestSnapshotSent)) {
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE;
@@ -250 +250 @@
 
       //if it's NOT a snapshot, NEITHER request NOR is it finished
-      if (!requested && !snapshot && job.State != State.finished) {
+      if (!requested && !snapshot && job.State != State.Finished) {
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE;
@@ -273 +273 @@
 
       JobDto job = DaoLocator.JobDao.FindById(jobId);
-      if (job.State == State.requestSnapshot || job.State == State.requestSnapshotSent) {
+      if (job.State == State.RequestSnapshot || job.State == State.RequestSnapshotSent) {
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_REQUEST_ALLREADY_SET;
         return response;
       }
-      if (job.State != State.calculating) {
+      if (job.State != State.Calculating) {
         response.Success = false;
         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED;
@@ -284 +284 @@
       }
       // job is in correct state
-      job.State = State.requestSnapshot;
+      job.State = State.RequestSnapshot;
       DaoLocator.JobDao.Update(job);
 
@@ -302 +302 @@
         return response; // no commit needed
       }
-      if (job.State == State.abort) {
+      if (job.State == State.Abort) {
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ABORT_REQUEST_ALLREADY_SET;
         return response; // no commit needed
       }
-      if (job.State != State.calculating && job.State != State.requestSnapshot && job.State != State.requestSnapshotSent) {
+      if (job.State != State.Calculating && job.State != State.RequestSnapshot && job.State != State.RequestSnapshotSent) {
         response.Success = false;
         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED;
@@ -313 +313 @@
       }
       // job is in correct state
-      job.State = State.abort;
+      job.State = State.Abort;
       DaoLocator.JobDao.Update(job);
 

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

@@ -55 +55 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.0.4107")]
-[assembly: AssemblyFileVersion("3.3.0.4107")]
-[assembly: AssemblyBuildDate("2010/07/27 14:15:12")]
+[assembly: AssemblyVersion("3.3.0.4111")]
+[assembly: AssemblyFileVersion("3.3.0.4111")]
+[assembly: AssemblyBuildDate("2010/07/27 18:31:46")]