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 '2.0'
Date Wed, 14 Aug 2019 21:19:01 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 503e0301b32b4c390c07dffd6581dfff4bd41eb3
Merge: 0acb7f8 c573676
Author: Keith Turner <kturner@apache.org>
AuthorDate: Wed Aug 14 17:18:22 2019 -0400

    Merge branch '2.0'

 .../accumulo/gc/GarbageCollectWriteAheadLogs.java  |  5 +++--
 .../apache/accumulo/master/FateServiceHandler.java |  3 ++-
 .../accumulo/master/util/TableValidators.java      | 22 ++++++++++++++++++++++
 .../accumulo/test/functional/CloneTestIT.java      | 16 ++++++++++++++++
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --cc server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index 5bb8201,289e69d..5637a8d
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@@ -94,8 -95,8 +95,8 @@@ public class GarbageCollectWriteAheadLo
      });
      liveServers.startListeningForTabletServerChanges();
      this.walMarker = new WalStateManager(context);
-     this.store = () -> Iterators.concat(new RootTabletStateStore(context).iterator(),
-         new MetaDataStateStore(context).iterator());
 -    this.store = () -> Iterators.concat(new ZooTabletStateStore(context).iterator(),
++    this.store = () -> Iterators.concat(new ZooTabletStateStore(context.getAmple()).iterator(),
+         new RootTabletStateStore(context).iterator(), new MetaDataStateStore(context).iterator());
    }
  
    /**


Mime
View raw message