Retry creating service directory (#3582)

* Keep trying to generate nodeId in case of DataCorruptionException * Retry creating service directory
CorfuDB · Apr 5, 2023 · db72bb4 · db72bb4
1 parent 844e4a8
commit db72bb4
Showing 1 changed file with 26 additions and 5 deletions.
diff --git a/infrastructure/src/main/java/org/corfudb/infrastructure/CorfuServer.java b/infrastructure/src/main/java/org/corfudb/infrastructure/CorfuServer.java
@@ -404,12 +404,20 @@ private static void configureLogger(Map<String, Object> opts) {
      *
      * @param opts Server options map.
      */
-    private static void createServiceDirectory(Map<String, Object> opts) {
+    private static void createServiceDirectory(Map<String, Object> opts) throws InterruptedException {
         if ((Boolean) opts.get("--memory")) {
             return;
         }
 
-        File serviceDir = new File((String) opts.get("--log-path"));
+        Optional<File> maybeServiceDir = Optional.ofNullable(opts.get("--log-path"))
+                .map(Object::toString)
+                .map(File::new);
+
+        if (!maybeServiceDir.isPresent()) {
+            throw new IllegalArgumentException("--log-path parameter is not set");
+        }
+
+        File serviceDir = maybeServiceDir.get();
 
         if (!serviceDir.isDirectory()) {
             log.error("Service directory {} does not point to a directory. Aborting.",
@@ -420,11 +428,24 @@ private static void createServiceDirectory(Map<String, Object> opts) {
         String corfuServiceDirPath = serviceDir.getAbsolutePath()
                 + File.separator
                 + "corfu";
-        File corfuServiceDir = new File(corfuServiceDirPath);
         // Update the new path with the dedicated child service directory.
         opts.put("--log-path", corfuServiceDirPath);
-        if (!corfuServiceDir.exists() && corfuServiceDir.mkdirs()) {
-            log.info("Created new service directory at {}.", corfuServiceDir);
+
+        while (true) {
+            File corfuServiceDir = new File(corfuServiceDirPath);
+
+            if (corfuServiceDir.exists()) {
+                log.info("Service directory at {} is present.", corfuServiceDir);
+                break;
+            }
+
+            if (corfuServiceDir.mkdirs()) {
+                log.info("Created new service directory at {}.", corfuServiceDir);
+                break;
+            }
+
+            log.error("New service directory at {} couldn't be created.", corfuServiceDir);
+            TimeUnit.SECONDS.sleep(TIMEOUT.getSeconds());
         }
     }