[accumulo] branch 1.9 updated: Examine WALs used by root tablet during GC (#1310)

[kturner]

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

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


The following commit(s) were added to refs/heads/1.9 by this push:
     new 54b2c32  Examine WALs used by root tablet during GC (#1310)
54b2c32 is described below

commit 54b2c327d02b9ea30785ba2ae9f5be59264a9713
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Wed Aug 14 16:07:07 2019 -0400

    Examine WALs used by root tablet during GC (#1310)
---
 .../org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index 405a7a0..23c4932 100644
--- 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++ 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@ -54,11 +54,13 @@ import 
org.apache.accumulo.server.log.WalStateManager.WalMarkerException;
 import org.apache.accumulo.server.log.WalStateManager.WalState;
 import org.apache.accumulo.server.master.LiveTServerSet;
 import org.apache.accumulo.server.master.LiveTServerSet.Listener;
+import org.apache.accumulo.server.master.state.DistributedStoreException;
 import org.apache.accumulo.server.master.state.MetaDataStateStore;
 import org.apache.accumulo.server.master.state.RootTabletStateStore;
 import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.server.master.state.TabletLocationState;
 import org.apache.accumulo.server.master.state.TabletState;
+import org.apache.accumulo.server.master.state.ZooTabletStateStore;
 import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.Path;
@@ -108,8 +110,13 @@ public class GarbageCollectWriteAheadLogs {
     this.store = new Iterable<TabletLocationState>() {
       @Override
       public Iterator<TabletLocationState> iterator() {
-        return Iterators.concat(new RootTabletStateStore(context).iterator(),
-            new MetaDataStateStore(context).iterator());
+        try {
+          return Iterators.concat(new ZooTabletStateStore().iterator(),
+              new RootTabletStateStore(context).iterator(),
+              new MetaDataStateStore(context).iterator());
+        } catch (DistributedStoreException e) {
+          throw new RuntimeException(e);
+        }
       }
     };
   }