ignore all dirs based on their path and the ttl

Author: tburch

src/main/java/com/lowtuna/jsonblob/core/BlobCleanupJob.java

@@ -9,9 +9,9 @@
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
-import java.util.stream.Collectors;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -25,14 +25,10 @@ public class BlobCleanupJob implements Runnable {
 
   @Override
   public void run() {
-    if (true) {
-        return;
-    }
-
     try {
       List<String> dataDirs = Lists.newCopyOnWriteArrayList();
 
-      Files.find(blobDirectory, 3, (p, bfa) -> !bfa.isRegularFile())
+      Files.find(blobDirectory, 4, (p, bfa) -> !bfa.isRegularFile() && isDataDir(p.toFile().getAbsolutePath()))
               .forEach(dataDir -> dataDirs.add(dataDir.toFile().getAbsolutePath()));
 
       log.debug("Found {} data directories", dataDirs.size());
@@ -44,11 +40,21 @@ public void run() {
           dir.delete();
         }
 
-        log.debug("Submitting DataDirectoryCleanupJob for {}", dataDirPath);
-        executorService.submit(new DataDirectoryCleanupJob(dataDirPath, executorService, fileSystemJsonBlobManager,blobAccessTtl, om, deleteEnabled));
+        String[] dateParts = dataDirPath.replace(blobDirectory.toFile().getAbsolutePath(), "").split("/", 4);
+
+        LocalDate localDate = LocalDate.of(Integer.parseInt(dateParts[1]), Integer.parseInt(dateParts[2]), Integer.parseInt(dateParts[3]));
+
+        if (localDate.isBefore(LocalDate.now().minusDays(blobAccessTtl.toDays()))) {
+          log.debug("Submitting DataDirectoryCleanupJob for {}", dataDirPath);
+          executorService.submit(new DataDirectoryCleanupJob(dataDirPath, executorService, fileSystemJsonBlobManager, blobAccessTtl, om, deleteEnabled));
+        }
       }
     } catch (Exception e) {
       log.warn("Couldn't remove old blobs", e);
     }
   }
+
+  private boolean isDataDir(String path) {
+    return path.replace(blobDirectory.toFile().getAbsolutePath(), "").split("/").length == 4;
+  }
 }

src/test/java/com/lowtuna/jsonblob/core/BlobCleanupJobTest.java

@@ -30,7 +30,7 @@ public class BlobCleanupJobTest {
     TEMP = dir;
   }
 
-  private final Duration blobTtl = Duration.minutes(1);
+  private final Duration blobTtl = Duration.days(1);
 
   private FileSystemJsonBlobManager blobManager;