Changeset 6267 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive

Timestamp:

05/24/11 16:55:48 (13 years ago)

Author:

cneumuel

Message:

#1233

• extended statistics recording:
  • execution times of users are captured
  • execution times and start-to-finish time of finished jobs is captured (to computer hive overhead)
  • data of deleted jobs is automatically captured in DeletedJobStatistics
• changed ExecutionTime type in database from string to float (milliseconds are stored instead of TimeSpan.ToString())
• added IsPrivileged field to job to indicate if it should be executed in a privileged sandbox
• added CpuUtilization field to slave to be able to report cpu utilization
• added GetJobsByResourceId to retrieve all jobs which are currently beeing calculated in a slave(-group)
• TransactionManager now allows to use serializable tranactions (used for lifecycle trigger)

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4

Files:

• HiveService.cs (modified) (5 diffs)
• LifecycleManager.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

@@ -147 +147 @@
       return trans.UseTransaction(() => {
         Job job = dao.UpdateJobState(jobId, jobState, slaveId, userId, exception);
-        
+
         if (job.Command.HasValue && job.Command.Value == Command.Pause && job.State == JobState.Paused) {
           job.Command = null;
@@ -280 +280 @@
           dbSlave.Memory = slaveInfo.Memory;
           dbSlave.OperatingSystem = slaveInfo.OperatingSystem;
-          
-          dbSlave.LastHeartbeat = DateTime.Now;          
+
+          dbSlave.LastHeartbeat = DateTime.Now;
           dbSlave.SlaveState = SlaveState.Idle;
 
@@ -472 +472 @@
 
     public void TriggerLifecycle(bool force) {
+      // use a serializable transaction here to ensure not two threads execute this simultaniously (locking would not work since IIS may use multiple AppDomains)
       trans.UseTransaction(() => {
         DateTime lastCleanup = dao.GetLastCleanup();
@@ -478 +479 @@
           lifecycleManager.Cleanup();
         }
-      });
+      }, true);
     }
     #endregion
@@ -526 +527 @@
       return trans.UseTransaction(() => dao.GetAppointments(x => x.ResourceId == resourceId));
     }
+
+    public IEnumerable<Job> GetJobsByResourceId(Guid resourceId) {
+      return trans.UseTransaction(() => dao.GetJobsByResourceId(resourceId));
+    }
     #endregion
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/LifecycleManager.cs

@@ -52 +52 @@
 
       dao.AddStatistics(stats);
-
-      //int slaveCount = slaves.Count();
-      //int cores = slaves.Select(x => x.Cores.HasValue ? x.Cores.Value : 0).Sum();
-      //int usedCores = slaves.Select(x => x.FreeCores.HasValue ? x.FreeCores.Value : 0).Sum();
-
-      //long memoryMb = slaves.Select(x => x.Memory.HasValue ? x.Memory.Value : 0).Sum(); ;
-      //long memoryUsedMb = slaves.Select(x => x.FreeMemory.HasValue ? x.FreeMemory.Value : 0).Sum();
-
-      //double averageCpuUtilization = slaves.Select(x => x.CpuUtilization.HasValue ? x.CpuUtilization.Value : 0).Average();
-
-      //int executionTimeDelta = 0; // since last update
-
-      //{ // per user
-      //  int activeJobs = 0; // calculating, transferring
-      //  int waitingJobs = 0; // waiting
-      //  int stoppedJobs = 0; // finished, failed, aborted, paused
-      //}
-
-      //{ // per slave
-      //  int activeJobs = 0; // calculating, transferring
-      //  double cpuUtilization = 0.0;
-      //}
-
     }