ACCUMULO-3320 Normalize the WAL using Path.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/84191c56 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/84191c56 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/84191c56 Branch: refs/heads/master Commit: 84191c56e504f01903c31e5e6a617d5dea961c40 Parents: f1aee3d Author: Josh Elser <els...@apache.org> Authored: Sat Nov 8 23:26:45 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Nov 10 13:34:51 2014 -0800 ---------------------------------------------------------------------- .../gc/replication/CloseWriteAheadLogReferences.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/84191c56/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java ---------------------------------------------------------------------- diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java b/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java index ae17f16..cb74f18 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java @@ -151,6 +151,8 @@ public class CloseWriteAheadLogReferences implements Runnable { return; } + log.debug("Got active WALs from all tservers " + activeWals); + referencedWals.addAll(activeWals); log.info("Found " + activeWals.size() + " WALs actively in use by TabletServers in " + sw.toString()); @@ -344,8 +346,11 @@ public class CloseWriteAheadLogReferences implements Runnable { log.debug("Could not fetch active wals from " + address); return null; } - log.debug("Got active wals for " + address + ", " + activeWalsForServer); - walogs.addAll(activeWalsForServer); + log.debug("Got raw active wals for " + address + ", " + activeWalsForServer); + for (String activeWal : activeWalsForServer) { + // Normalize the WAL URI + walogs.add(new Path(activeWal).toString()); + } } }
