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 2022/04/04 12:31:52 UTC
[hbase] branch branch-2 updated (ab9ccabe8fd -> 8ef1ae32e68)
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 ab9ccabe8fd HBASE-26921 Rewrite the counting cells part in TestMultiVersions (#4316)
new 3b383806bea HBASE-26924 Fix log parameter error and spelling error (#4318)
new 8ef1ae32e68 HBASE-26885 Addendum throw exception instead of return in TRSP to let the procedure retry (#4299)
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:
.../hadoop/hbase/master/assignment/TransitRegionStateProcedure.java | 2 +-
.../apache/hadoop/hbase/regionserver/ConstantSizeRegionSplitPolicy.java | 2 +-
.../hadoop/hbase/replication/regionserver/TestReplicationSource.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
[hbase] 01/02: HBASE-26924 Fix log parameter error and spelling error (#4318)
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 3b383806bead3e756a9d02c976aae1aebaadb39b
Author: weimingdiit <29...@qq.com>
AuthorDate: Mon Apr 4 20:20:30 2022 +0800
HBASE-26924 Fix log parameter error and spelling error (#4318)
Signed-off-by: Duo Zhang <zh...@apache.org>
Signed-off-by: Pankaj Kumar <pa...@apache.org>
(cherry picked from commit 003c572246749bfaee4d81bdbd7bddd73d6759c3)
---
.../apache/hadoop/hbase/regionserver/ConstantSizeRegionSplitPolicy.java | 2 +-
.../hadoop/hbase/replication/regionserver/TestReplicationSource.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ConstantSizeRegionSplitPolicy.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ConstantSizeRegionSplitPolicy.java
index 92b5ed8ce94..4588633c5ae 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ConstantSizeRegionSplitPolicy.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ConstantSizeRegionSplitPolicy.java
@@ -111,7 +111,7 @@ public class ConstantSizeRegionSplitPolicy extends RegionSplitPolicy {
for (HStore store : region.getStores()) {
long size = store.getSize();
if (size > sizeToCheck) {
- LOG.debug("ShouldSplit because {} size={}, sizeToCheck={}{}",
+ LOG.debug("ShouldSplit because {} size={}, sizeToCheck={}",
store.getColumnFamilyName(), StringUtils.humanSize(size),
StringUtils.humanSize(sizeToCheck));
return true;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSource.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSource.java
index 6da36005457..48b65fda29d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSource.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSource.java
@@ -589,7 +589,7 @@ public class TestReplicationSource {
/**
* Test ReplicationSource keeps retrying startup indefinitely without blocking the main thread,
- * when <b>eplication.source.regionserver.abort</b> is set to false.
+ * when <b>replication.source.regionserver.abort</b> is set to false.
*/
@Test
public void testAbortFalseOnErrorDoesntBlockMainThread() throws IOException {
[hbase] 02/02: HBASE-26885 Addendum throw exception instead of return in TRSP to let the procedure retry (#4299)
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 8ef1ae32e684f0fff1fd6c94639fc3473f0f03d6
Author: bsglz <18...@qq.com>
AuthorDate: Mon Apr 4 20:25:42 2022 +0800
HBASE-26885 Addendum throw exception instead of return in TRSP to let the procedure retry (#4299)
Signed-off-by: Duo Zhang <zh...@apache.org>
(cherry picked from commit 7f9d1f2259da5851b532ae93aaea75126c706688)
---
.../hadoop/hbase/master/assignment/TransitRegionStateProcedure.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/TransitRegionStateProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/TransitRegionStateProcedure.java
index d2001c62ad1..2adb19f0ace 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/TransitRegionStateProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/TransitRegionStateProcedure.java
@@ -205,7 +205,7 @@ public class TransitRegionStateProcedure
LOG.warn("No location specified for {}, jump back to state {} to get one", getRegion(),
RegionStateTransitionState.REGION_STATE_TRANSITION_GET_ASSIGN_CANDIDATE);
setNextState(RegionStateTransitionState.REGION_STATE_TRANSITION_GET_ASSIGN_CANDIDATE);
- return;
+ throw new HBaseIOException("Failed to open region, the location is null or bogus.");
}
env.getAssignmentManager().regionOpening(regionNode);
addChildProcedure(new OpenRegionProcedure(this, getRegion(), loc));