Author: ecn
Date: Wed Apr 17 14:52:52 2013
New Revision: 1468947
URL: http://svn.apache.org/r1468947
Log:
ACCUMULO-1285 account for files deleted regardless of how they are
trashed/deleted
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=1468947&r1=1468946&r2=1468947&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 Apr 17 14:52:52 2013
@@ -143,6 +143,7 @@ public class GarbageCollectWriteAheadLog
Path path = new Path(Constants.getWalDirectory(conf), filename);
if (trash == null || !trash.moveToTrash(path))
fs.delete(path, true);
+ status.currentLog.deleted++;
} catch (FileNotFoundException ex) {
// ignored
} catch (IOException ex) {
@@ -159,6 +160,7 @@ public class GarbageCollectWriteAheadLog
Path path = new Path(serverPath, filename);
if (trash == null || !trash.moveToTrash(path))
fs.delete(path, true);
+ status.currentLog.deleted++;
} catch (FileNotFoundException ex) {
// ignored
} catch (IOException ex) {
