Changeset 6381 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

Timestamp:

06/08/11 00:04:16 (13 years ago)

Author:

cneumuel

Message:

#1233

• locking for childHiveJobs in OptimizerHiveJob avoid multi threaded access issues
• added IsPrivileged to gui
• minor changes

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified) (5 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

@@ -228 +228 @@
       Guid jobId = (Guid)jobIdObj;
       Job job = null;
-      bool usedCoresIncremented = false;
+      int usedCores = 0;
       try {
         job = wcfService.GetJob(jobId);
@@ -234 +234 @@
         if (ConfigManager.Instance.GetFreeCores() < job.CoresNeeded) throw new OutOfCoresException();
         if (ConfigManager.GetFreeMemory() < job.MemoryNeeded) throw new OutOfMemoryException();
-        SlaveStatusInfo.IncrementUsedCores(job.CoresNeeded); usedCoresIncremented = true;
+        SlaveStatusInfo.IncrementUsedCores(job.CoresNeeded); usedCores = job.CoresNeeded;
         JobData jobData = wcfService.GetJobData(jobId);
         if (jobData == null) throw new JobDataNotFoundException(jobId);
@@ -242 +242 @@
       }
       catch (JobNotFoundException) {
-        if (usedCoresIncremented) SlaveStatusInfo.DecrementUsedCores(job.CoresNeeded);
+        SlaveStatusInfo.DecrementUsedCores(usedCores);
         throw;
       }
       catch (JobDataNotFoundException) {
-        SlaveStatusInfo.DecrementUsedCores(job.CoresNeeded);
+        SlaveStatusInfo.DecrementUsedCores(usedCores);
         throw;
       }
       catch (JobAlreadyRunningException) {
-        SlaveStatusInfo.DecrementUsedCores(job.CoresNeeded);
+        SlaveStatusInfo.DecrementUsedCores(usedCores);
         throw;
       }
@@ -261 +261 @@
         throw;
       }
-      catch (Exception) {
-        if (usedCoresIncremented) SlaveStatusInfo.DecrementUsedCores(job.CoresNeeded);
+      catch (Exception e) {
+        SlaveStatusInfo.DecrementUsedCores(usedCores);
+        wcfService.UpdateJobState(jobId, JobState.Waiting, e.ToString()); // unknown internal error - report and set waiting again
         throw;
       }
@@ -372 +373 @@
         job.ExecutionTime = slaveJob.ExecutionTime;
         if (jobData != null) {
-          wcfService.UpdateJobData(job, jobData, configManager.GetClientInfo().Id, JobState.Failed);
+          wcfService.UpdateJobData(job, jobData, configManager.GetClientInfo().Id, JobState.Failed, exception.ToString());
         } else {
           wcfService.UpdateJobState(job.Id, JobState.Failed, exception.ToString());