Changeset 16209 for trunk/HeuristicLab.Clients.Hive.Administrator

Timestamp:

10/03/18 15:06:21 (6 years ago)

Author:

jzenisek

Message:

#2839:

• adapted job execution implementation at ProjectJobsView
• prohibited resource checking for non-admins

Location:

trunk/HeuristicLab.Clients.Hive.Administrator/3.3/Views

Files:

• ProjectJobsView.cs (modified) (12 diffs)
• ResourcesView.cs (modified) (1 diff)

trunk/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectJobsView.cs

@@ -44 +44 @@
     private const string JOB_STATE = "State";
     private const string JOB_EXECUTIONSTATE = "Execution State";
+    private const string JOB_EXECUTIONTIME = "Execution Time";
     private const string JOB_DESCRIPTION = "Description";
     private const string JOB_TASKCOUNT = "Tasks";
+    private const string JOB_WAITINGTASKCOUNT = "Waiting";
     private const string JOB_CALCULATINGTASKCOUNT = "Calculating";
     private const string JOB_FINISHEDTASKCOUNT = "Finished";
@@ -112 +114 @@
         var jobs = GetSelectedJobs().ToList();
         if (jobs.Any()) {
-
-          // TODO: include isControllable?!
+                    
           startButton.Enabled = jobs.All(x =>
-            !x.IsProgressing && x.HiveTasks != null && x.HiveTasks.Count > 0
-            && x.Job.ProjectId != null && x.Job.ProjectId != Guid.Empty && x.Job.ResourceIds != null && x.Job.ResourceIds.Any()
+            !x.IsProgressing && HiveAdminClient.Instance.Tasks.ContainsKey(x.Id) && HiveAdminClient.Instance.Tasks[x.Id].Count > 0
+            && x.Job.ProjectId != Guid.Empty //&& x.Job.ResourceIds != null && x.Job.ResourceIds.Any()
             && (x.ExecutionState == ExecutionState.Prepared || x.ExecutionState == ExecutionState.Paused));
           pauseButton.Enabled = jobs.All(x => !x.IsProgressing && x.ExecutionState == ExecutionState.Started);
@@ -138 +139 @@
 
     private void refreshButton_Click(object sender, EventArgs e) {
-      var task = System.Threading.Tasks.Task.Factory.StartNew(RefreshJobsAsync);
       progress.Start("Refreshing jobs...");
       SetEnabledStateOfControls();
+      var task = System.Threading.Tasks.Task.Factory.StartNew(RefreshJobsAsync);
 
       task.ContinueWith((t) => {
-        matrixView.DataGridView.ClearSelection();
+        progress.Finish();        
+        SetEnabledStateOfControls();
       });
     }
@@ -157 +159 @@
           MessageBoxIcon.Question);
 
-        if (result == DialogResult.Yes) {          
+        if (result == DialogResult.Yes) {
+          progress.Start("Removing job(s)...");
+          SetEnabledStateOfControls();
           var task = System.Threading.Tasks.Task.Factory.StartNew(RemoveJobsAsync, jobs);
-          progress.Start();
-          SetEnabledStateOfControls();
-
-          task.ContinueWith((t) => {
-            matrixView.DataGridView.ClearSelection();
-            RefreshJobs();
-            progress.Finish();
+
+          task.ContinueWith((t) => {
+            RefreshJobs();
+            progress.Finish();
+            SetEnabledStateOfControls();
           }, TaskContinuationOptions.NotOnFaulted);
 
           task.ContinueWith((t) => {
-            matrixView.DataGridView.ClearSelection();
-            RefreshJobs();
-            progress.Finish();
-            MessageBox.Show("An error occured removing the job(s). " + t.Exception.Message, "HeuristicLab Hive Administrator", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            RefreshJobs();
+            progress.Finish();
+            SetEnabledStateOfControls();
+            MessageBox.Show("An error occured removing the job(s).", "HeuristicLab Hive Administrator", MessageBoxButtons.OK, MessageBoxIcon.Error);
           }, TaskContinuationOptions.OnlyOnFaulted);
         }
@@ -189 +191 @@
 
         if (result == DialogResult.Yes) {
+          progress.Start("Resuming job(s)...");
+          SetEnabledStateOfControls();
           var task = System.Threading.Tasks.Task.Factory.StartNew(ResumeJobsAsync, jobs);
-          progress.Start();
-          SetEnabledStateOfControls();
-
-          task.ContinueWith((t) => {
-            matrixView.DataGridView.ClearSelection();
-            RefreshJobs();
-            progress.Finish();
-          });
-
-          task.ContinueWith((t) => {
-            matrixView.DataGridView.ClearSelection();
-            RefreshJobs();
-            progress.Finish();
+
+          task.ContinueWith((t) => {
+            RefreshJobs();            
+            progress.Finish();
+            SetEnabledStateOfControls();
+          }, TaskContinuationOptions.NotOnFaulted);
+
+          task.ContinueWith((t) => {
+            RefreshJobs();
+            progress.Finish();
+            SetEnabledStateOfControls();
             MessageBox.Show("An error occured resuming the job(s).", "HeuristicLab Hive Administrator", MessageBoxButtons.OK, MessageBoxIcon.Error);
           }, TaskContinuationOptions.OnlyOnFaulted);
@@ -220 +222 @@
 
         if (result == DialogResult.Yes) {
+          progress.Start("Pausing job(s)...");
+          SetEnabledStateOfControls();
           var task = System.Threading.Tasks.Task.Factory.StartNew(PauseJobsAsync, jobs);
-          progress.Start();
-          SetEnabledStateOfControls();
-
-          task.ContinueWith((t) => {
-            matrixView.DataGridView.ClearSelection();
-            RefreshJobs();
-            progress.Finish();
-          });
-
-          task.ContinueWith((t) => {
-            matrixView.DataGridView.ClearSelection();
-            RefreshJobs();
-            progress.Finish();
+
+          task.ContinueWith((t) => {
+            RefreshJobs();            
+            progress.Finish();
+            SetEnabledStateOfControls();
+          }, TaskContinuationOptions.NotOnFaulted);
+
+          task.ContinueWith((t) => {
+            RefreshJobs();
+            progress.Finish();
+            SetEnabledStateOfControls();
             MessageBox.Show("An error occured pausing the job(s).", "HeuristicLab Hive Administrator", MessageBoxButtons.OK, MessageBoxIcon.Error);
           }, TaskContinuationOptions.OnlyOnFaulted);
@@ -251 +253 @@
 
         if (result == DialogResult.Yes) {
+          progress.Start("Stopping job(s)...");
+          SetEnabledStateOfControls();
           var task = System.Threading.Tasks.Task.Factory.StartNew(StopJobsAsync, jobs);
-          progress.Start();
-          SetEnabledStateOfControls();
-
-          task.ContinueWith((t) => {
-            matrixView.DataGridView.ClearSelection();
-            RefreshJobs();
-            progress.Finish();
-          });
-
-          task.ContinueWith((t) => {
-            matrixView.DataGridView.ClearSelection();
-            RefreshJobs();
-            progress.Finish();
+
+          task.ContinueWith((t) => {
+            RefreshJobs();
+            progress.Finish();
+            SetEnabledStateOfControls();
+          }, TaskContinuationOptions.NotOnFaulted);
+
+          task.ContinueWith((t) => {
+            RefreshJobs();
+            progress.Finish();
+            SetEnabledStateOfControls();
             MessageBox.Show("An error occured stopping the job(s).", "HeuristicLab Hive Administrator", MessageBoxButtons.OK, MessageBoxIcon.Error);            
           }, TaskContinuationOptions.OnlyOnFaulted);
@@ -287 +289 @@
       foreach (DataGridViewRow r in matrixView.DataGridView.SelectedRows) {
         if (((string)r.Cells[0].Value) == JobState.Online.ToString()) {
-          jobs.Add(HiveAdminClient.Instance.Jobs[Content.Id].FirstOrDefault(x => x.Id == Guid.Parse((string) r.Cells[9].Value)));
+          jobs.Add(HiveAdminClient.Instance.Jobs[Content.Id].FirstOrDefault(x => x.Id == Guid.Parse((string) r.Cells[11].Value)));
         }
       }
@@ -306 +308 @@
       var jobs = HiveAdminClient.Instance.Jobs[Content.Id];
       var resources = HiveAdminClient.Instance.Resources;
-      string[,] values = new string[jobs.Count, 11];
+      string[,] values = new string[jobs.Count, 13];
 
       for(int i = 0; i < jobs.Count; i++) {
@@ -312 +314 @@
         values[i, 0] = job.Job.State.ToString();
         values[i, 1] = job.ExecutionState.ToString();
-        values[i, 2] = job.Job.DateCreated.ToString();
-        values[i, 3] = job.Job.OwnerUsername;
-        values[i, 4] = job.Job.Name;
-        values[i, 5] = job.Job.JobCount.ToString();
-        values[i, 6] = job.Job.CalculatingCount.ToString();
-        values[i, 7] = job.Job.FinishedCount.ToString();
-        values[i, 8] = job.Job.Description;        
-        values[i, 9] = job.Job.Id.ToString();
-        values[i, 10] = job.Job.OwnerUserId.ToString();
+        values[i, 2] = job.ExecutionTime.ToString();
+        values[i, 3] = job.Job.DateCreated.ToString();
+        values[i, 4] = job.Job.OwnerUsername;
+        values[i, 5] = job.Job.Name;
+        values[i, 6] = job.Job.JobCount.ToString();
+        values[i, 7] = (job.Job.JobCount - job.Job.CalculatingCount - job.Job.FinishedCount).ToString();
+        values[i, 8] = job.Job.CalculatingCount.ToString();
+        values[i, 9] = job.Job.FinishedCount.ToString();
+        values[i, 10] = job.Job.Description;        
+        values[i, 11] = job.Job.Id.ToString();
+        values[i, 12] = job.Job.OwnerUserId.ToString();
       }
       
       var matrix = new StringMatrix(values);
-      matrix.ColumnNames = new string[] { JOB_STATE, JOB_EXECUTIONSTATE, JOB_DATECREATED, JOB_OWNER, JOB_NAME, JOB_TASKCOUNT, JOB_CALCULATINGTASKCOUNT, JOB_FINISHEDTASKCOUNT, JOB_DESCRIPTION, JOB_ID, JOB_OWNERID };
+      matrix.ColumnNames = new string[] { JOB_STATE, JOB_EXECUTIONSTATE, JOB_EXECUTIONTIME, JOB_DATECREATED, JOB_OWNER, JOB_NAME, JOB_TASKCOUNT, JOB_WAITINGTASKCOUNT, JOB_CALCULATINGTASKCOUNT, JOB_FINISHEDTASKCOUNT, JOB_DESCRIPTION, JOB_ID, JOB_OWNERID };
       matrix.SortableView = true;
       return matrix;
@@ -356 +360 @@
 
     private void RefreshJobsAsync() {
-      RefreshJobs();
+      HiveAdminClient.Instance.RefreshJobs();
+      UpdateJobs();
     }
 
@@ -387 +392 @@
       progress.Start();
       foreach (var job in jobList) {
-        progress.Status = "Deleting job \"" + job.Job.Name + "\"...";
+        progress.Status = "Removing job \"" + job.Job.Name + "\"...";
         HiveAdminClient.RemoveJob(job);
       }

trunk/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

@@ -318 +318 @@
 
     private void treeSlaveGroup_BeforeCheck(object sender, TreeViewCancelEventArgs e) {
-      if (e.Node == ungroupedGroupNode) {
+      if (!IsAdmin() || e.Node == ungroupedGroupNode) {
         e.Cancel = true;
       } else {