ACCUMULO-3609 Remove prevExtent check in DeleteTable Because the SKVI set on the Scanner might filter out records, the attempted consistency check can't actually validate that there is a linked-list across the prevRow's of tablets.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c59b115b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c59b115b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c59b115b Branch: refs/heads/master Commit: c59b115ba9a0b4ceabfc375143cce35fd7e05b1f Parents: c92c3c4 Author: Josh Elser <[email protected]> Authored: Mon Feb 23 22:23:58 2015 -0500 Committer: Josh Elser <[email protected]> Committed: Mon Feb 23 22:23:58 2015 -0500 ---------------------------------------------------------------------- .../apache/accumulo/server/master/tableOps/DeleteTable.java | 8 -------- 1 file changed, 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c59b115b/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java b/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java index 855c970..e632285 100644 --- a/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java +++ b/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java @@ -93,16 +93,8 @@ class CleanUp extends MasterRepo { MetaDataTableScanner.configureScanner(scanner, master); scanner.setRange(tableRange); - KeyExtent prevExtent = null; for (Entry<Key,Value> entry : scanner) { TabletLocationState locationState = MetaDataTableScanner.createTabletLocationState(entry.getKey(), entry.getValue()); - if (!locationState.extent.isPreviousExtent(prevExtent)) { - log.info("Still waiting for table to be deleted: " + tableId + " saw inconsistency " + prevExtent + " " + locationState.extent); - done = false; - break; - } - prevExtent = locationState.extent; - TabletState state = locationState.getState(master.onlineTabletServers()); if (state.equals(TabletState.ASSIGNED) || state.equals(TabletState.HOSTED)) { log.debug("Still waiting for table to be deleted: " + tableId + " locationState: " + locationState);
