You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zg...@apache.org on 2020/08/16 02:47:35 UTC
[hbase] branch branch-2.2 updated: HBASE-24881 Fix flaky
TestMasterAbortAndRSGotKilled for branch-2.2 (#2258)
This is an automated email from the ASF dual-hosted git repository.
zghao pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new 9e69503 HBASE-24881 Fix flaky TestMasterAbortAndRSGotKilled for branch-2.2 (#2258)
9e69503 is described below
commit 9e69503a2fe245bd72813819888479ce2e81b6df
Author: Guanghao Zhang <zg...@apache.org>
AuthorDate: Sun Aug 16 10:47:23 2020 +0800
HBASE-24881 Fix flaky TestMasterAbortAndRSGotKilled for branch-2.2 (#2258)
Signed-off-by: meiyi <my...@gmail.com>
---
.../java/org/apache/hadoop/hbase/regionserver/HRegionServer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index 67d5e9f..2942231 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -1155,7 +1155,7 @@ public class HRegionServer extends HasThread implements
}
if (!this.killed && this.fsOk) {
- waitOnAllRegionsToClose(abortRequested);
+ waitOnAllRegionsToClose();
LOG.info("stopping server " + this.serverName + "; all regions closed.");
}
@@ -1443,7 +1443,7 @@ public class HRegionServer extends HasThread implements
/**
* Wait on regions close.
*/
- private void waitOnAllRegionsToClose(final boolean abort) {
+ private void waitOnAllRegionsToClose() {
// Wait till all regions are closed before going out.
int lastCount = -1;
long previousLogTime = 0;
@@ -1475,7 +1475,7 @@ public class HRegionServer extends HasThread implements
!closedRegions.contains(hri.getEncodedName())) {
closedRegions.add(hri.getEncodedName());
// Don't update zk with this close transition; pass false.
- closeRegionIgnoreErrors(hri, abort);
+ closeRegionIgnoreErrors(hri, abortRequested);
}
}
// No regions in RIT, we could stop waiting now.