accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [accumulo] 01/01: Merge branch '1.9'
Date Fri, 04 May 2018 18:45:32 GMT
This is an automated email from the ASF dual-hosted git repository.

kturner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 38648a499110cfc630c0d4a6d4ce1ae2bb8f88d9
Merge: b056117 5bf5180
Author: Keith Turner <kturner@apache.org>
AuthorDate: Fri May 4 14:42:27 2018 -0400

    Merge branch '1.9'

 .../accumulo/gc/GarbageCollectWriteAheadLogs.java  | 89 +++++++++++++++++-----
 .../gc/GarbageCollectWriteAheadLogsTest.java       | 31 +++++++-
 2 files changed, 97 insertions(+), 23 deletions(-)

diff --cc server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index 02da2c4,405a7a0..c8b2e4e
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@@ -244,6 -251,21 +251,21 @@@ public class GarbageCollectWriteAheadLo
      return result;
    }
  
+   private long removeFile(Path path) {
+     try {
+       if (!useTrash || !fs.moveToTrash(path)) {
+         fs.deleteRecursively(path);
+       }
+       return 1;
+     } catch (FileNotFoundException ex) {
 -      log.debug("Attempted to delete WAL {} that did not exists : {}", path, ex.getMessage());
++      // ignored
+     } catch (IOException ex) {
+       log.error("Unable to delete wal {}", path, ex);
+     }
+ 
+     return 0;
+   }
+ 
    private long removeFiles(Collection<Pair<WalState,Path>> collection, final
GCStatus status) {
      for (Pair<WalState,Path> stateFile : collection) {
        Path path = stateFile.getSecond();

-- 
To stop receiving notification emails like this one, please contact
kturner@apache.org.

Mime
View raw message