Changeset 5787

Timestamp:

03/22/11 12:46:37 (14 years ago)

Author:

cneumuel

Message:

#1233

• made deleting and creating directories for PluginTemp more robust

File:

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

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

@@ -70 +70 @@
 
     private void DoUpdateRun() {
-      if (!Directory.Exists(PluginCacheDir)) {
-        Directory.CreateDirectory(PluginCacheDir);
-      }
-
+      SafelyCreateDirectory(PluginCacheDir);
       foreach (string dir in Directory.EnumerateDirectories(PluginCacheDir)) {
         cachedPluginsGuids.Add(Guid.Parse(GetFilenameFromPath(dir))); // Todo: cleaner solution to getFilenameFromPath
@@ -85 +82 @@
         String targetDir = Path.Combine(PluginTempBaseDir, jobId.ToString());
 
-        if (Directory.Exists(targetDir)) {
-          Directory.Delete(targetDir, true);
-        }
-        Directory.CreateDirectory(targetDir);
+        RecreateDirectory(targetDir);
 
         foreach (Plugin requestedPlugin in requests) {
@@ -116 +110 @@
     }
 
+    private static DirectoryInfo RecreateDirectory(String targetDir) {
+      var di = new DirectoryInfo(targetDir);
+      if (di.Exists) Directory.Delete(targetDir, true);
+      di.Refresh();
+      while (di.Exists) {
+        Thread.Sleep(50);
+        di.Refresh();
+      }
+      return SafelyCreateDirectory(targetDir);
+    }
+
+    private static DirectoryInfo SafelyCreateDirectory(String targetDir) {
+      var di = new DirectoryInfo(targetDir);
+      if (!di.Exists) {
+        di = Directory.CreateDirectory(targetDir);
+        while (!di.Exists) {
+          Thread.Sleep(50);
+          di.Refresh();
+        }
+      }
+      return di;
+    }
+
     private void CopyFile(string baseDir, string targetDir, string fileName) {
       if (!File.Exists(Path.Combine(targetDir, fileName))) File.Copy(Path.Combine(baseDir, fileName), Path.Combine(targetDir, fileName));
@@ -164 +181 @@
 
           //put all files belonging to a plugin in the same directory
-          if (!Directory.Exists(pluginDir)) {
-            DirectoryInfo di = Directory.CreateDirectory(pluginDir);
-          }
+          SafelyCreateDirectory(pluginDir);
           File.WriteAllBytes(Path.Combine(pluginDir, Path.GetFileName(pluginData.FileName)), pluginData.Data);
         }