You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/02/17 07:21:40 UTC
[1/2] hbase git commit: HBASE-20015 TestMergeTableRegionsProcedure
and TestRegionMergeTransactionOnCluster flakey
Repository: hbase
Updated Branches:
refs/heads/branch-2 8be069632 -> 3ea2ffcd5
HBASE-20015 TestMergeTableRegionsProcedure and TestRegionMergeTransactionOnCluster flakey
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/72193650
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/72193650
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/72193650
Branch: refs/heads/branch-2
Commit: 72193650dde2225e85d7bdb74b24ad39367145da
Parents: 8be0696
Author: Michael Stack <st...@apache.org>
Authored: Fri Feb 16 22:59:32 2018 -0800
Committer: Michael Stack <st...@apache.org>
Committed: Fri Feb 16 22:59:32 2018 -0800
----------------------------------------------------------------------
.../master/assignment/MergeTableRegionsProcedure.java | 14 ++++++++++----
.../master/assignment/SplitTableRegionProcedure.java | 1 +
2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/72193650/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java
index 4bccab7..baa399b 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java
@@ -255,10 +255,16 @@ public class MergeTableRegionsProcedure
throw new UnsupportedOperationException(this + " unhandled state=" + state);
}
} catch (IOException e) {
- LOG.warn("Error trying to merge regions " + RegionInfo.getShortNameToLog(regionsToMerge) +
- " in the table " + getTableName() + " (in state=" + state + ")", e);
-
- setFailure("master-merge-regions", e);
+ String msg = "Error trying to merge regions " +
+ RegionInfo.getShortNameToLog(regionsToMerge) + " in the table " + getTableName() +
+ " (in state=" + state + ")";
+ if (!isRollbackSupported(state)) {
+ // We reach a state that cannot be rolled back. We just need to keep retry.
+ LOG.warn(msg, e);
+ } else {
+ LOG.error(msg, e);
+ setFailure("master-merge-regions", e);
+ }
}
return Flow.HAS_MORE_STATE;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/72193650/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java
index c139566..e898d6a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java
@@ -270,6 +270,7 @@ public class SplitTableRegionProcedure
} else {
LOG.error(msg, e);
setFailure(e);
+ setFailure("master-split-regions", e);
}
}
// if split fails, need to call ((HRegion)parent).clearSplit() when it is a force split
[2/2] hbase git commit: HBASE-20013 TestZKPermissionWatcher is flakey
Posted by st...@apache.org.
HBASE-20013 TestZKPermissionWatcher is flakey
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3ea2ffcd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3ea2ffcd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3ea2ffcd
Branch: refs/heads/branch-2
Commit: 3ea2ffcd57df3eeb2a996ddc8b229449c8a9f87e
Parents: 7219365
Author: Michael Stack <st...@apache.org>
Authored: Fri Feb 16 20:11:03 2018 -0800
Committer: Michael Stack <st...@apache.org>
Committed: Fri Feb 16 23:19:07 2018 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/master/HMaster.java | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3ea2ffcd/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index aa22130..dcab9f4 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -2729,11 +2729,21 @@ public class HMaster extends HRegionServer implements MasterServices {
}
}
- void checkInitialized()
- throws PleaseHoldException, ServerNotRunningYetException, MasterNotRunningException {
+ public static class MasterStoppedException extends DoNotRetryIOException {
+ MasterStoppedException() {
+ super();
+ }
+ }
+
+ void checkInitialized() throws PleaseHoldException, ServerNotRunningYetException,
+ MasterNotRunningException, MasterStoppedException {
checkServiceStarted();
- if (!isInitialized()) throw new PleaseHoldException("Master is initializing");
- if (isStopped()) throw new MasterNotRunningException();
+ if (!isInitialized()) {
+ throw new PleaseHoldException("Master is initializing");
+ }
+ if (isStopped()) {
+ throw new MasterStoppedException();
+ }
}
/**