accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1458981 - /accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
Date Wed, 20 Mar 2013 17:58:36 GMT
Author: ecn
Date: Wed Mar 20 17:58:36 2013
New Revision: 1458981

URL: http://svn.apache.org/r1458981
Log:
ACCUMULO-804 avoid spewing warnings when deleting missing WALogs, which is the normal case

Modified:
    accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java

Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java?rev=1458981&r1=1458980&r2=1458981&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
(original)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
Wed Mar 20 17:58:36 2013
@@ -189,13 +189,13 @@ public class GarbageCollectWriteAheadLog
       log.debug("Removing sorted WAL " + sortedWALog);
       try {
         Path swalog = new Path(recoveryDir, sortedWALog);
-        if (trash == null || !trash.moveToTrash(swalog)) {
+        if (trash == null || (fs.exists(swalog) && !trash.moveToTrash(swalog))) {
           fs.delete(swalog, true);
         }
       } catch (FileNotFoundException ex) {
         // ignored
       } catch (IOException ioe) {
-        log.error("Unable to delete sorted walog " + sortedWALogs + ": " + ioe);
+        log.error("Unable to delete sorted walog " + sortedWALog + ": " + ioe);
       }
     }
 



Mime
View raw message