0001586: Stage manager doesn't check to see if a file is actually del…

…eted when it qualifies for cleaning.
JumpMind · Feb 16, 2014 · 099435b · 099435b
1 parent 63af64c
commit 099435b
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 13 deletions.
diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/stage/IStagedResource.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/stage/IStagedResource.java
@@ -63,8 +63,10 @@ public String getExtensionName() {
 
     public boolean isFileResource();
 
-    public void delete();
+    public boolean delete();
 
     public boolean exists();
+
+    public boolean isInUse();
 
 }
diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/stage/StagedResource.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/stage/StagedResource.java
@@ -103,6 +103,10 @@ public StagedResource(long threshold, File directory, String path, StagingManage
         this.state = State.CREATE;
     }
 
+    public boolean isInUse() {
+        return readers.size() > 0 || writers.size() > 0;
+    }
+
     public boolean isFileResource() {     
         return file != null && file.exists();
     }
@@ -250,7 +254,7 @@ public BufferedWriter getWriter() {
                 log.warn("We had to delete {} because it already existed", file.getAbsolutePath());
                 file.delete();
             } else if (this.memoryBuffer != null) {
-                log.warn("We had to delete the memory buffer because it already existed");
+                log.warn("We had to delete the memory buffer for {} because it already existed", getPath());
                 this.memoryBuffer = null;
             }
             this.memoryBuffer = new StringBuilder();
@@ -283,20 +287,27 @@ public void refreshLastUpdateTime() {
         this.lastUpdateTime = System.currentTimeMillis();
     }
 
-    public void delete() {
+    public boolean delete() {
+
+        boolean deleted = true;
 
         close();
 
         if (file.exists()) {
             FileUtils.deleteQuietly(file);
+            deleted = !file.exists();            
         }
 
         if (memoryBuffer != null) {
             memoryBuffer.setLength(0);
             memoryBuffer = null;
         }
 
-        stagingManager.resourceList.remove(getPath());
+        if (deleted) {
+            stagingManager.resourceList.remove(getPath());
+        }
+
+        return deleted;
 
     }
 

diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/stage/StagingManager.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/stage/StagingManager.java
@@ -91,17 +91,26 @@ public long clean(long ttlInMs) {
             for (String key : keys) {
                 IStagedResource resource = resourceList.get(key);
                 boolean resourceIsOld = (System.currentTimeMillis() - resource.getLastUpdateTime()) > ttlInMs;
-                if ((resource.getState() == State.READY || resource.getState() == State.DONE)
-                        && (resourceIsOld || !resource.exists())) {
-                    if (resource.isFileResource()) {
-                        purgedFileCount++;
-                        purgedFileSize += resource.getSize();
+                if (resource.isInUse() && (resource.getState() == State.READY || resource.getState() == State.DONE)
+                        && (resourceIsOld || !resource.exists())) {                    
+                    if (!resource.isInUse()) {
+                        boolean file = resource.isFileResource();
+                        long size = resource.getSize(); 
+                        if (resource.delete()) {                            
+                            if (file) {
+                                purgedFileCount++;
+                                purgedFileSize += size;
+                            } else {
+                                purgedMemCount++;
+                                purgedMemSize += size;
+                            }
+                           resourceList.remove(key);
+                        } else {
+                            log.warn("Failed to delete the '{}' staging resource", resource.getPath());
+                        }
                     } else {
-                        purgedMemCount++;
-                        purgedMemSize += resource.getSize();
+                        log.warn("The '{}' staging resource qualified for being cleaned, but was in use.  It will not be cleaned right now", resource.getPath());
                     }
-                    resource.delete();
-                    resourceList.remove(key);
                 }
             }
             if (purgedFileCount > 0) {