Revert "HBASE-12891 Parallel execution for Hbck checkRegionConsistency"
This reverts commit eddd5739a14ceb5cfc9b9c7d2e357eea96bd9703. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7f4146bf Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7f4146bf Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7f4146bf Branch: refs/heads/hbase-11339 Commit: 7f4146bf4d4df84041b284a76d917d602b5531da Parents: 1426f85 Author: Andrew Purtell <[email protected]> Authored: Fri Feb 6 16:52:04 2015 -0800 Committer: Andrew Purtell <[email protected]> Committed: Fri Feb 6 16:52:04 2015 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/util/HBaseFsck.java | 28 +------------------- 1 file changed, 1 insertion(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/7f4146bf/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java index 96bd0f7..8e1d848 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java @@ -1703,19 +1703,9 @@ public class HBaseFsck extends Configured implements Closeable { throws IOException, KeeperException, InterruptedException { // Divide the checks in two phases. One for default/primary replicas and another // for the non-primary ones. Keeps code cleaner this way. - List<WorkItemRegionConsistency> workItems = - new ArrayList<WorkItemRegionConsistency>(regionInfoMap.size()); for (java.util.Map.Entry<String, HbckInfo> e: regionInfoMap.entrySet()) { if (e.getValue().getReplicaId() == HRegionInfo.DEFAULT_REPLICA_ID) { - workItems.add(new WorkItemRegionConsistency(e.getKey(), e.getValue())); - } - } - List<Future<Void>> workFutures = executor.invokeAll(workItems); - for(Future<Void> f: workFutures) { - try { - f.get(); - } catch(ExecutionException e1) { - LOG.warn("Could not check region consistency " , e1.getCause()); + checkRegionConsistency(e.getKey(), e.getValue()); } } boolean prevHdfsCheck = shouldCheckHdfs(); @@ -2365,22 +2355,6 @@ public class HBaseFsck extends Configured implements Closeable { } }; - class WorkItemRegionConsistency implements Callable<Void> { - private final String key; - private final HbckInfo hbi; - - WorkItemRegionConsistency(String key, HbckInfo hbi) { - this.key = key; - this.hbi = hbi; - } - - @Override - public synchronized Void call() throws Exception { - checkRegionConsistency(key, hbi); - return null; - } - } - /** * Maintain information about a particular table.
