ivakegg commented on a change in pull request #2293:
URL: https://github.com/apache/accumulo/pull/2293#discussion_r743118154
##########
File path:
server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
##########
@@ -217,11 +221,50 @@ private void confirmDeletes(GarbageCollectionEnvironment
gce,
throw new RuntimeException(
"Scanner over metadata table returned unexpected column : " +
entry.getKey());
}
+ Set<String> tableIdsAfter = gce.getTableIDs();
+ ensureAllTablesChecked(Collections.unmodifiableSet(tableIdsBefore),
+ Collections.unmodifiableSet(tableIdsSeen),
Collections.unmodifiableSet(tableIdsAfter));
confirmDeletesFromReplication(gce.getReplicationNeededIterator(),
candidateMap.entrySet().iterator());
}
+ @VisibleForTesting
+ /**
+ *
+ */
+ protected void ensureAllTablesChecked(Set<String> tableIdsBefore,
Set<String> tableIdsSeen,
+ Set<String> tableIdsAfter) {
+
+ // if a table was added or deleted during this run, it is acceptable to not
+ // have seen those tables ids when scanning the metadata table. So get the
intersection
+ Set<String> tableIdsMustHaveSeen = new HashSet<>(tableIdsBefore);
+ tableIdsMustHaveSeen.retainAll(tableIdsAfter);
+
+ if (tableIdsMustHaveSeen.isEmpty() && !tableIdsSeen.isEmpty()) {
Review comment:
if tableIdsMustHaveSeen is empty, then that is enough to fail. There
should always be at least 1 table, i.e. the accumulo.metadata table. It
shouldn't matter if tableIdsSeen is empty or not.
##########
File path:
server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
##########
@@ -217,11 +221,50 @@ private void confirmDeletes(GarbageCollectionEnvironment
gce,
throw new RuntimeException(
"Scanner over metadata table returned unexpected column : " +
entry.getKey());
}
+ Set<String> tableIdsAfter = gce.getTableIDs();
+ ensureAllTablesChecked(Collections.unmodifiableSet(tableIdsBefore),
+ Collections.unmodifiableSet(tableIdsSeen),
Collections.unmodifiableSet(tableIdsAfter));
confirmDeletesFromReplication(gce.getReplicationNeededIterator(),
candidateMap.entrySet().iterator());
}
+ @VisibleForTesting
+ /**
+ *
Review comment:
some comments here might be nice describing the context of this check.
The context includes that we pulled the candidate delete list prior to these
scans. Hence we only really care that the tableIdsSeen is a super set of the
intersection of the ids before and after. There need to be more words to
connect those two sentences....
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
