You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2023/05/23 14:59:57 UTC
[hbase] branch branch-2 updated (0ba562ab4d2 -> 6aeaaa11986)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a change to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
from 0ba562ab4d2 HBASE-27874 Problem in flakey generated report causes pre-commit run to fail (#5244)
new 093097e591c HBASE-27277 TestRaceBetweenSCPAndTRSP fails in pre commit (#5248)
new 6aeaaa11986 HBASE-27880 Bump requests from 2.28.1 to 2.31.0 in /dev-support/flaky-tests (#5250)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dev-support/python-requirements.txt | 2 +-
.../hbase/procedure2/RemoteProcedureDispatcher.java | 7 +++++++
.../master/assignment/TestRaceBetweenSCPAndTRSP.java | 19 ++++++++++++++++++-
3 files changed, 26 insertions(+), 2 deletions(-)
[hbase] 01/02: HBASE-27277 TestRaceBetweenSCPAndTRSP fails in pre commit (#5248)
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 093097e591c1bd30902cc00f4926857bdcec1458
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Tue May 23 22:45:18 2023 +0800
HBASE-27277 TestRaceBetweenSCPAndTRSP fails in pre commit (#5248)
Signed-off-by: GeorryHuang <hu...@apache.org>
(cherry picked from commit dc30ca552b37c864b962fbeaaed548523f30573b)
---
.../hbase/procedure2/RemoteProcedureDispatcher.java | 7 +++++++
.../master/assignment/TestRaceBetweenSCPAndTRSP.java | 19 ++++++++++++++++++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/RemoteProcedureDispatcher.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/RemoteProcedureDispatcher.java
index b58a875b12d..a1e31a0436e 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/RemoteProcedureDispatcher.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/RemoteProcedureDispatcher.java
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hbase.procedure2;
+import com.google.errorprone.annotations.RestrictedApi;
import java.io.IOException;
import java.lang.Thread.UncaughtExceptionHandler;
import java.util.HashSet;
@@ -296,6 +297,12 @@ public abstract class RemoteProcedureDispatcher<TEnv, TRemote extends Comparable
return (List<T>) requestByType.removeAll(type);
}
+ @RestrictedApi(explanation = "Should only be called in tests", link = "",
+ allowedOnPath = ".*/src/test/.*")
+ public boolean hasNode(TRemote key) {
+ return nodeMap.containsKey(key);
+ }
+
// ============================================================================================
// Timeout Helpers
// ============================================================================================
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndTRSP.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndTRSP.java
index 9dd209a1abe..2cf96aa24eb 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndTRSP.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndTRSP.java
@@ -31,6 +31,7 @@ import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.master.MasterServices;
import org.apache.hadoop.hbase.master.RegionPlan;
+import org.apache.hadoop.hbase.master.procedure.RSProcedureDispatcher;
import org.apache.hadoop.hbase.master.procedure.ServerCrashProcedure;
import org.apache.hadoop.hbase.master.region.MasterRegion;
import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;
@@ -147,16 +148,32 @@ public class TestRaceBetweenSCPAndTRSP {
Future<byte[]> moveFuture = am.moveAsync(new RegionPlan(region, sn, sn));
arriveRegionOpening.await();
+ // Kill the region server and trigger a SCP
UTIL.getMiniHBaseCluster().killRegionServer(sn);
+ // Wait until the SCP reaches the getRegionsOnServer call
arriveGetRegionsOnServer.await();
+ RSProcedureDispatcher remoteDispatcher = UTIL.getMiniHBaseCluster().getMaster()
+ .getMasterProcedureExecutor().getEnvironment().getRemoteDispatcher();
+ // this is necessary for making the UT stable, the problem here is that, in
+ // ServerManager.expireServer, we will submit the SCP and then the SCP will be executed in
+ // another thread(the PEWorker), so when we reach the above getRegionsOnServer call in SCP, it
+ // is still possible that the expireServer call has not been finished so the remote dispatcher
+ // still think it can dispatcher the TRSP, in this way we will be in dead lock as the TRSP will
+ // not schedule a new ORP since it relies on SCP to wake it up after everything is OK. This is
+ // not what we want to test in this UT so we need to wait here to prevent this from happening.
+ // See HBASE-27277 for more detailed analysis.
+ UTIL.waitFor(15000, () -> !remoteDispatcher.hasNode(sn));
+
+ // Resume the TRSP, it should be able to finish
RESUME_REGION_OPENING.countDown();
-
moveFuture.get();
+
ProcedureExecutor<?> procExec =
UTIL.getMiniHBaseCluster().getMaster().getMasterProcedureExecutor();
long scpProcId =
procExec.getProcedures().stream().filter(p -> p instanceof ServerCrashProcedure)
.map(p -> (ServerCrashProcedure) p).findAny().get().getProcId();
+ // Resume the SCP and make sure it can finish too
RESUME_GET_REGIONS_ON_SERVER.countDown();
UTIL.waitFor(60000, () -> procExec.isFinished(scpProcId));
}
[hbase] 02/02: HBASE-27880 Bump requests from 2.28.1 to 2.31.0 in /dev-support/flaky-tests (#5250)
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 6aeaaa119869b202fdf3d5aa3bb85ef344e37eb8
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue May 23 22:56:30 2023 +0800
HBASE-27880 Bump requests from 2.28.1 to 2.31.0 in /dev-support/flaky-tests (#5250)
Bumps [requests](https://github.com/psf/requests) from 2.28.1 to 2.31.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.28.1...v2.31.0)
---
updated-dependencies:
- dependency-name: requests
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
Signed-off-by: Duo Zhang <zh...@apache.org>
(cherry picked from commit 22526a6339afa230679bcf08fa1c917b04cdac6d)
---
dev-support/python-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-support/python-requirements.txt b/dev-support/python-requirements.txt
index 2377064eaa1..683e6e7213f 100644
--- a/dev-support/python-requirements.txt
+++ b/dev-support/python-requirements.txt
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-requests==2.28.1
+requests==2.31.0
future==0.18.3
gitpython==3.1.30
rbtools==4.0