You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/02/07 01:52:56 UTC
[1/3] hbase git commit: Revert "HBASE-12891 Parallel execution for
Hbck checkRegionConsistency"
Repository: hbase
Updated Branches:
refs/heads/0.98 be82ea78f -> 5f57c0771
refs/heads/branch-1 c234b8df9 -> a7b811255
refs/heads/master 1426f85b1 -> 7f4146bf4
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/master
Commit: 7f4146bf4d4df84041b284a76d917d602b5531da
Parents: 1426f85
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Feb 6 16:52:04 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
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.
[2/3] hbase git commit: Revert "HBASE-12891 Parallel execution for
Hbck checkRegionConsistency"
Posted by ap...@apache.org.
Revert "HBASE-12891 Parallel execution for Hbck checkRegionConsistency"
This reverts commit b14614c948357d2cc3655c71d6904ea5a8c6b921.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a7b81125
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a7b81125
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a7b81125
Branch: refs/heads/branch-1
Commit: a7b81125553e021284ac3f85b589a389ad7d1f8b
Parents: c234b8d
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Feb 6 16:52:21 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Feb 6 16:52:21 2015 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/util/HBaseFsck.java | 32 ++------------------
1 file changed, 3 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a7b81125/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 377439a..f1f01c8 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
@@ -1694,21 +1694,11 @@ public class HBaseFsck extends Configured implements Closeable {
*/
private void checkAndFixConsistency()
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());
+ // Divide the checks in two phases. One for default/primary replicas and another
+ // for the non-primary ones. Keeps code cleaner this way.
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();
@@ -2359,22 +2349,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.
[3/3] hbase git commit: Revert "HBASE-12891 Parallel execution for
Hbck checkRegionConsistency"
Posted by ap...@apache.org.
Revert "HBASE-12891 Parallel execution for Hbck checkRegionConsistency"
This reverts commit de08a82c64beb265d89037ceabda76309e3912fc.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5f57c077
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5f57c077
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5f57c077
Branch: refs/heads/0.98
Commit: 5f57c07713031f4b6ec1e536812f5811ac3d31cd
Parents: be82ea7
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Feb 6 16:52:34 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Feb 6 16:52:34 2015 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/util/HBaseFsck.java | 31 ++------------------
1 file changed, 2 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/5f57c077/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 410831c..dd2ac41 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
@@ -1648,20 +1648,9 @@ public class HBaseFsck extends Configured {
*/
private void checkAndFixConsistency()
throws IOException, KeeperException, InterruptedException {
- List<WorkItemRegionConsistency> workItems =
- Lists.newArrayListWithExpectedSize(regionInfoMap.size());
- for (java.util.Map.Entry<String, HbckInfo> e : regionInfoMap.entrySet()) {
- workItems.add(new WorkItemRegionConsistency(e.getKey(), e.getValue()));
+ for (java.util.Map.Entry<String, HbckInfo> e: regionInfoMap.entrySet()) {
+ checkRegionConsistency(e.getKey(), e.getValue());
}
- List<Future<Void>> workFutures = executor.invokeAll(workItems);
- for(Future<Void> f: workFutures) {
- try {
- f.get();
- } catch(ExecutionException e) {
- LOG.warn("Could not check region consistency " , e.getCause());
- }
- }
- LOG.info("Completed checks for " + regionInfoMap.size() + " regions");
}
private void preCheckPermission() throws IOException, AccessDeniedException {
@@ -2239,22 +2228,6 @@ public class HBaseFsck extends Configured {
}
};
- 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.