hbase git commit: HBASE-21113 Apply the branch-2 version of HBASE-21095, The timeout retry logic for several procedures are broken after master restarts(addendum)
Repository: hbase
Updated Branches:
refs/heads/branch-2.1 d954031d5 -> 33fa32d71
HBASE-21113 Apply the branch-2 version of HBASE-21095, The timeout retry logic
for several procedures are broken after master restarts(addendum)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/33fa32d7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/33fa32d7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/33fa32d7
Branch: refs/heads/branch-2.1
Commit: 33fa32d7116b86118ff007cc6447d7d63f7976f9
Parents: d954031
Author: Allan Yang
Authored: Sun Aug 26 22:15:49 2018 +0800
Committer: Allan Yang
Committed: Sun Aug 26 22:15:49 2018 +0800
--
.../hbase/master/assignment/TestUnexpectedStateException.java | 2 --
1 file changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/33fa32d7/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
index 16648c0..868b93b 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
@@ -69,8 +69,6 @@ public class TestUnexpectedStateException {
@BeforeClass
public static void beforeClass() throws Exception {
-
TEST_UTIL.getConfiguration().setBoolean("hbase.localcluster.assign.random.ports",
false);
-TEST_UTIL.getConfiguration().setInt(HConstants.MASTER_INFO_PORT, 50655);
TEST_UTIL.startMiniCluster();
}
hbase git commit: HBASE-21113 Apply the branch-2 version of HBASE-21095, The timeout retry logic for several procedures are broken after master restarts(addendum)
Repository: hbase
Updated Branches:
refs/heads/branch-2.0 2e885195a -> 346aa6c99
HBASE-21113 Apply the branch-2 version of HBASE-21095, The timeout retry logic
for several procedures are broken after master restarts(addendum)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/346aa6c9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/346aa6c9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/346aa6c9
Branch: refs/heads/branch-2.0
Commit: 346aa6c99f013af072a3894392ec2c4cf37b988f
Parents: 2e88519
Author: Allan Yang
Authored: Sun Aug 26 22:10:23 2018 +0800
Committer: Allan Yang
Committed: Sun Aug 26 22:10:23 2018 +0800
--
.../hbase/master/assignment/TestUnexpectedStateException.java | 2 --
1 file changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/346aa6c9/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
index 16648c0..868b93b 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
@@ -69,8 +69,6 @@ public class TestUnexpectedStateException {
@BeforeClass
public static void beforeClass() throws Exception {
-
TEST_UTIL.getConfiguration().setBoolean("hbase.localcluster.assign.random.ports",
false);
-TEST_UTIL.getConfiguration().setInt(HConstants.MASTER_INFO_PORT, 50655);
TEST_UTIL.startMiniCluster();
}
hbase git commit: HBASE-21113 Apply the branch-2 version of HBASE-21095, The timeout retry logic for several procedures are broken after master restarts
Repository: hbase
Updated Branches:
refs/heads/branch-2.0 19b722e84 -> 5c130fc75
HBASE-21113 Apply the branch-2 version of HBASE-21095, The timeout retry
logic for several procedures are broken after master restarts
I applied the patch HBASE-21095 and then reverted it so could apply the
patch as HBASE-21113 (by reverting the HBASE-21095 revert but pushing
with this message!).
Revert "Revert "HBASE-21095 The timeout retry logic for several procedures are
broken after master restarts""
This reverts commit 19b722e8412b48d6318a9599b702995e99099d7e.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5c130fc7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5c130fc7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5c130fc7
Branch: refs/heads/branch-2.0
Commit: 5c130fc75705525f75d519481b0c5dbc533a8082
Parents: 19b722e
Author: Michael Stack
Authored: Fri Aug 24 12:36:25 2018 -0700
Committer: Michael Stack
Committed: Fri Aug 24 12:36:25 2018 -0700
--
.../assignment/RegionTransitionProcedure.java | 11 ---
.../assignment/TestUnexpectedStateException.java | 18 ++
2 files changed, 18 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/5c130fc7/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java
index de39f4c..c9d141a 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java
@@ -371,12 +371,9 @@ public abstract class RegionTransitionProcedure
LOG.warn("Failed transition, suspend {}secs {}; {}; waiting on rectified
condition fixed " +
"by other Procedure or operator intervention", backoff / 1000,
this,
regionNode.toShortString(), e);
- getRegionState(env).getProcedureEvent().suspend();
- if (getRegionState(env).getProcedureEvent().suspendIfNotReady(this)) {
-setTimeout(Math.toIntExact(backoff));
-setState(ProcedureProtos.ProcedureState.WAITING_TIMEOUT);
-throw new ProcedureSuspendedException();
- }
+ setTimeout(Math.toIntExact(backoff));
+ setState(ProcedureProtos.ProcedureState.WAITING_TIMEOUT);
+ throw new ProcedureSuspendedException();
}
return new Procedure[] {this};
@@ -394,7 +391,7 @@ public abstract class RegionTransitionProcedure
@Override
protected synchronized boolean setTimeoutFailure(MasterProcedureEnv env) {
setState(ProcedureProtos.ProcedureState.RUNNABLE);
-getRegionState(env).getProcedureEvent().wake(env.getProcedureScheduler());
+env.getProcedureScheduler().addFront(this);
return false; // 'false' means that this procedure handled the timeout
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/5c130fc7/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
index 0f62f8e..16648c0 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
@@ -24,17 +24,15 @@ import java.util.Iterator;
import java.util.List;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.RegionInfo;
+import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Threads;
-import org.apache.hbase.thirdparty.com.google.gson.JsonArray;
-import org.apache.hbase.thirdparty.com.google.gson.JsonElement;
-import org.apache.hbase.thirdparty.com.google.gson.JsonObject;
-import org.apache.hbase.thirdparty.com.google.gson.JsonParser;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@@
hbase git commit: HBASE-21113 Apply the branch-2 version of HBASE-21095, The timeout retry logic for several procedures are broken after master restarts
Repository: hbase
Updated Branches:
refs/heads/branch-2 a220566b9 -> 6047fb05f
HBASE-21113 Apply the branch-2 version of HBASE-21095, The timeout retry logic
for several procedures are broken after master restarts
I applied the patch HBASE-21095 and then reverted it so could apply the
patch as HBASE-21113 (by reverting the HBASE-21095 revert but pushing
with this message!).
Revert "Revert "HBASE-21095 The timeout retry logic for several procedures are
broken after master restarts""
This reverts commit a220566b9875615e92a848d109b17fcfc1566b19.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6047fb05
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6047fb05
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6047fb05
Branch: refs/heads/branch-2
Commit: 6047fb05f51fa4a1551157ac498b8d86ff4f7c2b
Parents: a220566
Author: Michael Stack
Authored: Fri Aug 24 12:32:33 2018 -0700
Committer: Michael Stack
Committed: Fri Aug 24 12:32:33 2018 -0700
--
.../assignment/RegionTransitionProcedure.java | 11 ---
.../assignment/TestUnexpectedStateException.java | 18 ++
2 files changed, 18 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/6047fb05/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java
index 0db8676..c10bf2d 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java
@@ -364,12 +364,9 @@ public abstract class RegionTransitionProcedure
LOG.warn("Failed transition, suspend {}secs {}; {}; waiting on rectified
condition fixed " +
"by other Procedure or operator intervention", backoff / 1000,
this,
regionNode.toShortString(), e);
- getRegionState(env).getProcedureEvent().suspend();
- if (getRegionState(env).getProcedureEvent().suspendIfNotReady(this)) {
-setTimeout(Math.toIntExact(backoff));
-setState(ProcedureProtos.ProcedureState.WAITING_TIMEOUT);
-throw new ProcedureSuspendedException();
- }
+ setTimeout(Math.toIntExact(backoff));
+ setState(ProcedureProtos.ProcedureState.WAITING_TIMEOUT);
+ throw new ProcedureSuspendedException();
}
return new Procedure[] {this};
@@ -387,7 +384,7 @@ public abstract class RegionTransitionProcedure
@Override
protected synchronized boolean setTimeoutFailure(MasterProcedureEnv env) {
setState(ProcedureProtos.ProcedureState.RUNNABLE);
-getRegionState(env).getProcedureEvent().wake(env.getProcedureScheduler());
+env.getProcedureScheduler().addFront(this);
return false; // 'false' means that this procedure handled the timeout
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/6047fb05/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
index 0f62f8e..16648c0 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestUnexpectedStateException.java
@@ -24,17 +24,15 @@ import java.util.Iterator;
import java.util.List;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.RegionInfo;
+import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Threads;
-import org.apache.hbase.thirdparty.com.google.gson.JsonArray;
-import org.apache.hbase.thirdparty.com.google.gson.JsonElement;
-import org.apache.hbase.thirdparty.com.google.gson.JsonObject;
-import org.apache.hbase.thirdparty.com.google.gson.JsonParser;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@@
