Changeset 6464 for branches/HeuristicLab.Hive-3.4/sources

Timestamp:

06/21/11 17:29:56 (14 years ago)

Author:

ascheibe

Message:

#1233

• some Admin UI bugfixes

Slave:

• fixed bug when Pause is called immediately after Calculate
• send exceptions when something goes wrong in Pause or Stop

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Administration/3.4/Views/ResourcesView.cs (modified) (8 diffs)
• HeuristicLab.Clients.Hive.Administration/3.4/Views/SlaveView.Designer.cs (modified) (9 diffs)
• HeuristicLab.Clients.Hive.Administration/3.4/Views/SlaveView.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/Executor.cs (modified) (11 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/ExecutorMessage.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/Manager/HeartbeatManager.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/Properties/Settings.Designer.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/Properties/Settings.settings (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/SlaveJob.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/app_ascheibe.config (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/app_f005pc.config (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/app_services.config (modified) (3 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.4/Tools/prepareHiveDatabase.sql (deleted)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/ResourcesView.cs

@@ -38 +38 @@
     }
 
+    private const string ungroupedGroupName = "UNGROUPED";
+    private const int slaveImageIndex = 0;
+    private const int slaveGroupImageIndex = 1;
+
+
     public ResourcesView() {
       InitializeComponent();
@@ -68 +73 @@
 
         //rebuild
-        TreeNode ungrp = new TreeNode("UNGROUPED");
-        ungrp.ImageIndex = treeSlaveGroup.ImageList.Images.Count - 1;
+        TreeNode ungrp = new TreeNode(ungroupedGroupName);
+        ungrp.ImageIndex = slaveGroupImageIndex;
         ungrp.SelectedImageIndex = ungrp.ImageIndex;
         var newGroup = new SlaveGroup();
-        newGroup.Name = "UNGROUPED";
+        newGroup.Name = ungroupedGroupName;
         newGroup.Id = Guid.NewGuid();
         newGroup.Description = "Contains slaves which are in no group";
@@ -82 +87 @@
             if (g.ParentResourceId == null) {
               TreeNode tn = new TreeNode();
-              tn.ImageIndex = treeSlaveGroup.ImageList.Images.Count - 1;
+              tn.ImageIndex = slaveGroupImageIndex;
               tn.SelectedImageIndex = tn.ImageIndex;
 
@@ -89 +94 @@
 
               BuildSlaveGroupTree(g, tn);
+              tn.ExpandAll();
               treeSlaveGroup.Nodes.Add(tn);
             }
@@ -94 +100 @@
             if (g.ParentResourceId == null) {
               var stn = new TreeNode(g.Name);
-              stn.ImageIndex = 0;
+              stn.ImageIndex = slaveImageIndex;
               stn.SelectedImageIndex = stn.ImageIndex;
               stn.Tag = g;
@@ -101 +107 @@
           }
         }
+        ungrp.ExpandAll();
         treeSlaveGroup.Nodes.Add(ungrp);
       }
@@ -111 +118 @@
           stn.ImageIndex = 0;
         } else if (r is SlaveGroup) {
-          stn.ImageIndex = treeSlaveGroup.ImageList.Images.Count - 1;
+          stn.ImageIndex = slaveGroupImageIndex;
         }
         stn.SelectedImageIndex = stn.ImageIndex;
@@ -204 +211 @@
 
         if (destNode.TreeView == newNode.TreeView) {
+          if (destNode.Text == ungroupedGroupName || (destNode.Parent != null && destNode.Parent.Text == ungroupedGroupName)) {
+            MessageBox.Show(String.Format("You can't drag items to the {0} group.{1}This group only contains slaves which haven't yet been assigned to a real group.",
+              ungroupedGroupName, Environment.NewLine), "HeuristicLab Hive Administration", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            return;
+          }
+
           SlaveGroup sgrp = null;
           if (destNode.Tag != null && destNode.Tag is SlaveGroup) {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/SlaveView.Designer.cs

@@ -69 +69 @@
       this.txtSlaveState.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtSlaveState.Enabled = false;
       this.txtSlaveState.Location = new System.Drawing.Point(120, 186);
       this.txtSlaveState.Name = "txtSlaveState";
@@ -78 +79 @@
       this.txtOS.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtOS.Enabled = false;
       this.txtOS.Location = new System.Drawing.Point(120, 160);
       this.txtOS.Name = "txtOS";
@@ -105 +107 @@
       this.txtDetailsDescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtDetailsDescription.Enabled = false;
       this.txtDetailsDescription.Location = new System.Drawing.Point(120, 56);
       this.txtDetailsDescription.Name = "txtDetailsDescription";
@@ -127 +130 @@
       this.txtName.Size = new System.Drawing.Size(249, 20);
       this.txtName.TabIndex = 21;
-      this.txtName.TextChanged += new System.EventHandler(this.txtName_TextChanged_1);
+      this.txtName.TextChanged += new System.EventHandler(this.txtName_TextChanged);
       // 
       // txtCPU
@@ -133 +136 @@
       this.txtCPU.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtCPU.Enabled = false;
       this.txtCPU.Location = new System.Drawing.Point(120, 82);
       this.txtCPU.Name = "txtCPU";
@@ -142 +146 @@
       this.txtMemory.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtMemory.Enabled = false;
       this.txtMemory.Location = new System.Drawing.Point(120, 108);
       this.txtMemory.Name = "txtMemory";
@@ -151 +156 @@
       this.txtLastHeartbeat.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtLastHeartbeat.Enabled = false;
       this.txtLastHeartbeat.Location = new System.Drawing.Point(120, 212);
       this.txtLastHeartbeat.Name = "txtLastHeartbeat";
@@ -205 +211 @@
       this.txtFreeMemory.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtFreeMemory.Enabled = false;
       this.txtFreeMemory.Location = new System.Drawing.Point(120, 134);
       this.txtFreeMemory.Name = "txtFreeMemory";
@@ -214 +221 @@
       this.txtId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtId.Enabled = false;
       this.txtId.Location = new System.Drawing.Point(120, 30);
       this.txtId.Name = "txtId";

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/SlaveView.cs

@@ -66 +66 @@
           Slave ct = (Slave)Content;
           txtName.Text = ct.Name;
-          txtCPU.Text = ct.Cores.ToString() + " Cores @ " + ct.CpuSpeed.ToString() + " Mhz, Arch.: " + ct.CpuArchitecture.ToString();
+          txtCPU.Text = string.Format("{0} Cores @ {1} Mhz, Arch.: {2}", ct.Cores.ToString(), ct.CpuSpeed.ToString(), ct.CpuArchitecture.ToString());
           txtDetailsDescription.Text = ct.Description;
           txtMemory.Text = ct.Memory.ToString();
@@ -78 +78 @@
           txtName.Text = ct.Name;
           ShowSlaveUI(false);
-        } else
+        } else {
           throw new Exception("Unknown Resource in SlaveView");
-
+        }
       }
-    }
-
-    void txtName_TextChanged(object sender, EventArgs e) {
-      throw new NotImplementedException();
     }
 
@@ -105 +101 @@
       txtFreeMemory.Visible = show;
       txtId.Visible = show;
+      txtName.Enabled = !show;
     }
 
@@ -111 +108 @@
     }
 
-    private void txtName_TextChanged_1(object sender, EventArgs e) {
+    private void txtName_TextChanged(object sender, EventArgs e) {
       if (Content != null && Content is SlaveGroup) {
         Content.Name = txtName.Text;

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

@@ -299 +299 @@
         throw;
       }
+      catch (AppDomainNotCreatedException) {
+        throw;
+      }
     }
 
@@ -394 +397 @@
       heartbeatManager.AwakeHeartBeatThread();
       clientCom.LogMessage(string.Format("Exception occured for job {0}: {1}", e.Value.JobId, e.Value2.ToString()));
+      wcfService.UpdateJobState(e.Value.JobId, JobState.Waiting, e.Value2.ToString());
     }
 

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

@@ -33 +33 @@
   public class Executor : MarshalByRefObject, IDisposable {
     private bool wasJobAborted = false;
-    private Semaphore pauseStopSem = new Semaphore(0, 1);
-    private Semaphore startJobSem = new Semaphore(0, 1);
-    private Semaphore jobStartedSem = new Semaphore(0, 1); // make pause or stop wait until start is finished
+    private AutoResetEvent pauseStopSem = new AutoResetEvent(false);
+    private AutoResetEvent startJobSem = new AutoResetEvent(false); // block start method call
+    private AutoResetEvent jobStartedSem = new AutoResetEvent(false); // make pause or stop wait until start is finished
     private ExecutorQueue executorQueue;
     private bool jobDataInvalid = false; // if true, the jobdata is not sent when the job is failed
@@ -47 +47 @@
     public bool IsPausing { get; set; }
 
-    private Exception currentException;
-    public String CurrentException {
+    public Exception CurrentException;
+    public String CurrentExceptionStr {
       get {
-        if (currentException != null) {
-          return currentException.ToString();
+        if (CurrentException != null) {
+          return CurrentException.ToString();
         } else {
           return string.Empty;
@@ -84 +84 @@
 
         job.Start();
-        if (!jobStartedSem.WaitOne(TimeSpan.FromSeconds(Settings.Default.ExecutorSemTimeouts))) {
+        if (!startJobSem.WaitOne(Settings.Default.ExecutorSemTimeouts)) {
           jobDataInvalid = true;
           throw new TimeoutException("Timeout when starting the job. JobStarted event was not fired.");
         }
-        jobStartedSem.Release();
       }
       catch (Exception e) {
-        this.currentException = e;
+        this.CurrentException = e;
         Job_JobFailed(this, new EventArgs<Exception>(e));
+      }
+      finally {
+        jobStartedSem.Set();
       }
     }
@@ -101 +103 @@
       jobStartedSem.WaitOne(Settings.Default.ExecutorSemTimeouts);
       if (job == null) {
-        currentException = new Exception("Pausing job " + this.JobId + ": Job is null");
+        CurrentException = new Exception("Pausing job " + this.JobId + ": Job is null");
+        executorQueue.AddMessage(ExecutorMessageType.ExceptionOccured);
         return;
       }
@@ -112 +115 @@
         }
         catch (Exception ex) {
-          currentException = new Exception("Error pausing job " + this.JobId + ": " + ex.ToString());
+          CurrentException = new Exception("Error pausing job " + this.JobId + ": " + ex.ToString());
+          executorQueue.AddMessage(ExecutorMessageType.ExceptionOccured);
         }
       }
@@ -122 +126 @@
       jobStartedSem.WaitOne(Settings.Default.ExecutorSemTimeouts);
       if (job == null) {
-        currentException = new Exception("Stopping job " + this.JobId + ": Job is null");
+        CurrentException = new Exception("Stopping job " + this.JobId + ": Job is null");
+        executorQueue.AddMessage(ExecutorMessageType.ExceptionOccured);
       }
       wasJobAborted = true;
@@ -132 +137 @@
         }
         catch (Exception ex) {
-          currentException = new Exception("Error stopping job " + this.JobId + ": " + ex.ToString());
+          CurrentException = new Exception("Error stopping job " + this.JobId + ": " + ex.ToString());
+          executorQueue.AddMessage(ExecutorMessageType.ExceptionOccured);
         }
       }
@@ -155 +161 @@
       IsStopping = true;
       EventArgs<Exception> ex = (EventArgs<Exception>)e;
-      currentException = ex.Value;
-
+      CurrentException = ex.Value;
       executorQueue.AddMessage(ExecutorMessageType.JobFailed);
     }
@@ -162 +167 @@
     private void Job_JobStopped(object sender, EventArgs e) {
       IsStopping = true;
-      if (wasJobAborted)
-        pauseStopSem.Release();
-
+      if (wasJobAborted) {
+        pauseStopSem.Set();
+      }
       executorQueue.AddMessage(ExecutorMessageType.JobStopped);
     }
@@ -170 +175 @@
     private void Job_JobPaused(object sender, EventArgs e) {
       IsPausing = true;
-      pauseStopSem.Release();
+      pauseStopSem.Set();
       executorQueue.AddMessage(ExecutorMessageType.JobPaused);
     }
 
     private void Job_JobStarted(object sender, EventArgs e) {
-      jobStartedSem.Release();
+      startJobSem.Set();
       executorQueue.AddMessage(ExecutorMessageType.JobStarted);
     }
@@ -190 +195 @@
           //send empty job and save exception
           jobData.Data = PersistenceUtil.Serialize(new JobData());
-          if (currentException == null) {
-            currentException = new Exception("Job with id " + this.JobId + " is null, sending empty job");
+          if (CurrentException == null) {
+            CurrentException = new Exception("Job with id " + this.JobId + " is null, sending empty job");
           }
         } else {

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

@@ -30 +30 @@
     JobStopped,
     JobFailed,
-    StopExecutorMonitoringThread
+    StopExecutorMonitoringThread,
+    ExceptionOccured
   }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Manager/HeartbeatManager.cs

@@ -40 +40 @@
 
     public HeartbeatManager() {
-      Interval = new TimeSpan(0, 0, Settings.Default.HeartbeatInterval);
+      Interval = Settings.Default.HeartbeatInterval;
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Properties/Settings.Designer.cs

@@ -26 +26 @@
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("10")]
-        public int HeartbeatInterval {
-            get {
-                return ((int)(this["HeartbeatInterval"]));
+        [global::System.Configuration.DefaultSettingValueAttribute("00:00:10")]
+        public global::System.TimeSpan HeartbeatInterval {
+            get {
+                return ((global::System.TimeSpan)(this["HeartbeatInterval"]));
             }
             set {
@@ -182 +182 @@
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("50")]
-        public int DirOpSleepTime {
-            get {
-                return ((int)(this["DirOpSleepTime"]));
+        [global::System.Configuration.DefaultSettingValueAttribute("00:00:01")]
+        public global::System.TimeSpan DirOpSleepTime {
+            get {
+                return ((global::System.TimeSpan)(this["DirOpSleepTime"]));
             }
             set {
@@ -206 +206 @@
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("1000")]
-        public int PluginDeletionTimeout {
-            get {
-                return ((int)(this["PluginDeletionTimeout"]));
+        [global::System.Configuration.DefaultSettingValueAttribute("00:00:01")]
+        public global::System.TimeSpan PluginDeletionTimeout {
+            get {
+                return ((global::System.TimeSpan)(this["PluginDeletionTimeout"]));
             }
             set {
@@ -218 +218 @@
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("45")]
-        public int ExecutorSemTimeouts {
-            get {
-                return ((int)(this["ExecutorSemTimeouts"]));
+        [global::System.Configuration.DefaultSettingValueAttribute("00:00:46")]
+        public global::System.TimeSpan ExecutorSemTimeouts {
+            get {
+                return ((global::System.TimeSpan)(this["ExecutorSemTimeouts"]));
             }
             set {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Properties/Settings.settings

@@ -3 +3 @@
   <Profiles />
   <Settings>
-    <Setting Name="HeartbeatInterval" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">10</Value>
+    <Setting Name="HeartbeatInterval" Type="System.TimeSpan" Scope="User">
+      <Value Profile="(Default)">00:00:10</Value>
     </Setting>
     <Setting Name="LastUsedFileName" Type="System.String" Scope="User">
@@ -42 +42 @@
       <Value Profile="(Default)">3</Value>
     </Setting>
-    <Setting Name="DirOpSleepTime" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">50</Value>
+    <Setting Name="DirOpSleepTime" Type="System.TimeSpan" Scope="User">
+      <Value Profile="(Default)">00:00:01</Value>
     </Setting>
     <Setting Name="PluginDeletionRetries" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">5</Value>
     </Setting>
-    <Setting Name="PluginDeletionTimeout" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">1000</Value>
+    <Setting Name="PluginDeletionTimeout" Type="System.TimeSpan" Scope="User">
+      <Value Profile="(Default)">00:00:01</Value>
     </Setting>
-    <Setting Name="ExecutorSemTimeouts" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">45</Value>
+    <Setting Name="ExecutorSemTimeouts" Type="System.TimeSpan" Scope="User">
+      <Value Profile="(Default)">00:00:46</Value>
     </Setting>
     <Setting Name="QueuesMaxThreads" Type="System.Int32" Scope="User">

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

@@ -202 +202 @@
           case ExecutorMessageType.JobFailed:
             executorMonitoringRun = false;
-            OnJobFailed(new JobFailedException(executor.CurrentException));
+            OnJobFailed(new JobFailedException(executor.CurrentExceptionStr));
             DisposeAppDomain();
             break;
@@ -208 +208 @@
           case ExecutorMessageType.StopExecutorMonitoringThread:
             executorMonitoringRun = false;
-            return;
+            break;
+
+          case ExecutorMessageType.ExceptionOccured:
+            executorMonitoringRun = false;
+            DisposeAppDomain();
+            if (executor.CurrentException != null) {
+              OnExceptionOccured(executor.CurrentException);
+            } else {
+              OnExceptionOccured(new Exception(string.Format("Unknow exception occured in Executor for job {0}", JobId)));
+            }
+            break;
         }
       }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_ascheibe.config

@@ -13 +13 @@
     <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
       <setting name="HeartbeatInterval" serializeAs="String">
-        <value>10</value>
+        <value>00:00:10</value>
       </setting>
       <setting name="LastUsedFileName" serializeAs="String">
@@ -52 +52 @@
       </setting>
       <setting name="DirOpSleepTime" serializeAs="String">
-        <value>50</value>
+        <value>00:00:01</value>
       </setting>
       <setting name="PluginDeletionRetries" serializeAs="String">
@@ -58 +58 @@
       </setting>
       <setting name="PluginDeletionTimeout" serializeAs="String">
-        <value>1000</value>
+        <value>00:00:01</value>
       </setting>
       <setting name="ExecutorSemTimeouts" serializeAs="String">
-        <value>45</value>
+        <value>00:00:46</value>
       </setting>
       <setting name="QueuesMaxThreads" serializeAs="String">

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_f005pc.config

@@ -13 +13 @@
     <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
       <setting name="HeartbeatInterval" serializeAs="String">
-        <value>10</value>
+        <value>00:00:10</value>
       </setting>
       <setting name="LastUsedFileName" serializeAs="String">
@@ -52 +52 @@
       </setting>
       <setting name="DirOpSleepTime" serializeAs="String">
-        <value>50</value>
+        <value>00:00:01</value>
       </setting>
       <setting name="PluginDeletionRetries" serializeAs="String">
@@ -58 +58 @@
       </setting>
       <setting name="PluginDeletionTimeout" serializeAs="String">
-        <value>1000</value>
+        <value>00:00:01</value>
       </setting>
       <setting name="ExecutorSemTimeouts" serializeAs="String">
-        <value>45</value>
+        <value>00:00:46</value>
       </setting>
       <setting name="QueuesMaxThreads" serializeAs="String">

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_services.config

@@ -13 +13 @@
     <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
       <setting name="HeartbeatInterval" serializeAs="String">
-        <value>10</value>
+        <value>00:00:10</value>
       </setting>
       <setting name="LastUsedFileName" serializeAs="String">
@@ -52 +52 @@
       </setting>
       <setting name="DirOpSleepTime" serializeAs="String">
-        <value>50</value>
+        <value>00:00:01</value>
       </setting>
       <setting name="PluginDeletionRetries" serializeAs="String">
@@ -58 +58 @@
       </setting>
       <setting name="PluginDeletionTimeout" serializeAs="String">
-        <value>1000</value>
+        <value>00:00:01</value>
       </setting>
       <setting name="ExecutorSemTimeouts" serializeAs="String">
-        <value>45</value>
+        <value>00:00:46</value>
       </setting>
       <setting name="QueuesMaxThreads" serializeAs="String">