You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/03/20 18:58:36 UTC
svn commit: r1458981 -
/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
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);
}
}