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 2025/03/20 08:35:47 UTC
(hbase) branch branch-3 updated (b7b8bf5925b -> 809e12a9825)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a change to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase.git
from b7b8bf5925b HBASE-29186 RegionPlanConditionals can produce a null pointer (#6796) (#6811)
new 4076e81ddac HBASE-29188 Region replica replication can not handle table drop correctly (#6800)
new 809e12a9825 HBASE-29198 Change the profile for building with jdk11 in hbase-it to jdk17 (#6824)
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:
hbase-it/pom.xml | 6 ++---
.../handler/RegionReplicaFlushHandler.java | 26 ++++++++++++++++++----
2 files changed, 25 insertions(+), 7 deletions(-)
(hbase) 01/02: HBASE-29188 Region replica replication can not handle table drop correctly (#6800)
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 4076e81ddacf9d48d48946e2dd72f3aeee3c5421
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Thu Mar 20 15:07:59 2025 +0800
HBASE-29188 Region replica replication can not handle table drop correctly (#6800)
Signed-off-by: Nick Dimiduk <nd...@apache.org>
(cherry picked from commit 3823d6ef09c615fdb92d2dce4929293ad70e1ee8)
---
.../handler/RegionReplicaFlushHandler.java | 26 ++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/RegionReplicaFlushHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/RegionReplicaFlushHandler.java
index 5b3f053d847..e16be79f2ae 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/RegionReplicaFlushHandler.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/RegionReplicaFlushHandler.java
@@ -91,6 +91,27 @@ public class RegionReplicaFlushHandler extends EventHandler {
return numRetries;
}
+ private boolean isTableDisabledOrDropped(IOException error, HRegion region) {
+ if (error instanceof TableNotFoundException) {
+ return true;
+ }
+ try {
+ if (
+ FutureUtils.get(connection.getAdmin().isTableDisabled(region.getRegionInfo().getTable()))
+ ) {
+ return true;
+ }
+ } catch (IOException e) {
+ if (error instanceof TableNotFoundException) {
+ return true;
+ } else {
+ LOG.warn("failed tp check whether table {} is disabled", region.getRegionInfo().getTable(),
+ e);
+ }
+ }
+ return false;
+ }
+
void triggerFlushInPrimaryRegion(final HRegion region) throws IOException {
long pause = connection.getConfiguration().getLong(HConstants.HBASE_CLIENT_PAUSE,
HConstants.DEFAULT_HBASE_CLIENT_PAUSE);
@@ -114,10 +135,7 @@ public class RegionReplicaFlushHandler extends EventHandler {
response = FutureUtils.get(connection.flush(ServerRegionReplicaUtil
.getRegionInfoForDefaultReplica(region.getRegionInfo()).getRegionName(), true));
} catch (IOException e) {
- if (
- e instanceof TableNotFoundException || FutureUtils
- .get(connection.getAdmin().isTableDisabled(region.getRegionInfo().getTable()))
- ) {
+ if (isTableDisabledOrDropped(e, region)) {
return;
}
if (!counter.shouldRetry()) {
(hbase) 02/02: HBASE-29198 Change the profile for building with jdk11 in hbase-it to jdk17 (#6824)
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 809e12a98254fcf6b436df35e6b810f32733e306
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Thu Mar 20 15:08:39 2025 +0800
HBASE-29198 Change the profile for building with jdk11 in hbase-it to jdk17 (#6824)
Signed-off-by: Nihal Jain <ni...@apache.org>
(cherry picked from commit f8c1a671758298f26b93872037994d5c07fdecab)
---
hbase-it/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index c3fe14c07b1..15cc52e0b22 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -335,12 +335,12 @@
</properties>
</profile>
<profile>
- <id>build-with-jdk11</id>
+ <id>build-with-jdk17</id>
<activation>
- <jdk>[1.11,)</jdk>
+ <jdk>[17,)</jdk>
</activation>
<properties>
- <failsafe.profile.overrides>${hbase-surefire.jdk11.flags}</failsafe.profile.overrides>
+ <failsafe.profile.overrides>${hbase-surefire.jdk17.flags}</failsafe.profile.overrides>
</properties>
<dependencies>