[accumulo] branch master updated (b056117 -> 38648a4)

[kt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

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


    from b056117  Removed redundant local variables (#462)
     add 5bf5180  fixes #432 Made GC clean up recovery logs (#444)
     new 38648a4  Merge branch '1.9'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


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

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

[accumulo] 01/01: Merge branch '1.9'

[kt...@apache.org]

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 <kt...@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.