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/15 02:56:15 UTC
[hbase] branch branch-2 updated (caa0f3a1898 -> 2fc73585a78)
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 caa0f3a1898 HBASE-27858 Update surefire version to 3.1.0 and use SurefireForkNodeFactory (#5234)
new 7ab58962560 HBASE-27863 Add hadoop 3.3.5 check in our personality script (#5236)
new 409bafbf9cf HBASE-27865 TestThriftServerCmdLine fails with org.apache.hadoop.hbase.SystemExitRule (#5238)
new 2fc73585a78 HBASE-27864 Reduce the Cardinality for TestFuzzyRowFilterEndToEndLarge (#5237)
The 3 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/hbase-personality.sh | 8 ++++----
.../hadoop/hbase/filter/TestFuzzyRowFilterEndToEndLarge.java | 6 +++---
.../main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java | 10 ++++------
3 files changed, 11 insertions(+), 13 deletions(-)
[hbase] 01/03: HBASE-27863 Add hadoop 3.3.5 check in our personality script (#5236)
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 7ab5896256013657e73aae552318aad691fe1d4c
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Mon May 15 10:34:46 2023 +0800
HBASE-27863 Add hadoop 3.3.5 check in our personality script (#5236)
Signed-off-by: Liangjun He <he...@apache.org>
(cherry picked from commit b28feeb989bec9709fcfbaa5066669cedea77bda)
---
dev-support/hbase-personality.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index facf3fc077a..48eb55e3eaf 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -598,16 +598,16 @@ function hadoopcheck_rebuild
if [[ "${PATCH_BRANCH}" = branch-2.4 ]]; then
yetus_info "Setting Hadoop 3 versions to test based on branch-2.4 rules"
if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
- hbase_hadoop3_versions="3.1.4 3.2.4 3.3.4"
+ hbase_hadoop3_versions="3.1.4 3.2.4 3.3.5"
else
- hbase_hadoop3_versions="3.1.1 3.1.2 3.1.3 3.1.4 3.2.0 3.2.1 3.2.2 3.2.3 3.2.4 3.3.0 3.3.1 3.3.2 3.3.3 3.3.4"
+ hbase_hadoop3_versions="3.1.1 3.1.2 3.1.3 3.1.4 3.2.0 3.2.1 3.2.2 3.2.3 3.2.4 3.3.0 3.3.1 3.3.2 3.3.3 3.3.4 3.3.5"
fi
else
yetus_info "Setting Hadoop 3 versions to test based on branch-2.5+/master/feature branch rules"
if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
- hbase_hadoop3_versions="3.2.4 3.3.4"
+ hbase_hadoop3_versions="3.2.4 3.3.5"
else
- hbase_hadoop3_versions="3.2.3 3.2.4 3.3.2 3.3.3 3.3.4"
+ hbase_hadoop3_versions="3.2.3 3.2.4 3.3.2 3.3.3 3.3.4 3.3.5"
fi
fi
[hbase] 02/03: HBASE-27865 TestThriftServerCmdLine fails with org.apache.hadoop.hbase.SystemExitRule (#5238)
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 409bafbf9cf5d91970c59fef70e46b1877cb2469
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Mon May 15 10:35:24 2023 +0800
HBASE-27865 TestThriftServerCmdLine fails with org.apache.hadoop.hbase.SystemExitRule (#5238)
Signed-off-by: Liangjun He <he...@apache.org>
Signed-off-by: Xin Sun <dd...@gmail.com>
(cherry picked from commit fd4f984d87dc189f7afc6ddc50d5373e23b46ad5)
---
.../main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
index 33bd2ae869f..81887034aea 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
@@ -833,9 +833,9 @@ public class ThriftServer extends Configured implements Tool {
} else {
setupServer();
}
- serviceUGI.doAs(new PrivilegedAction<Object>() {
+ return serviceUGI.doAs(new PrivilegedAction<Integer>() {
@Override
- public Object run() {
+ public Integer run() {
try {
startInfoServer();
if (httpEnabled) {
@@ -844,15 +844,13 @@ public class ThriftServer extends Configured implements Tool {
} else {
tserver.serve();
}
+ return 0;
} catch (Exception e) {
LOG.error(HBaseMarkers.FATAL, "Cannot run ThriftServer", e);
-
- System.exit(-1);
+ return -1;
}
- return null;
}
});
- return 0;
}
public static void main(String[] args) throws Exception {
[hbase] 03/03: HBASE-27864 Reduce the Cardinality for TestFuzzyRowFilterEndToEndLarge (#5237)
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 2fc73585a78832b3ee7ff851961e66888587d3e4
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Mon May 15 10:35:40 2023 +0800
HBASE-27864 Reduce the Cardinality for TestFuzzyRowFilterEndToEndLarge (#5237)
From 50^3 to 30^3, 125000 -> 27000
Signed-off-by: Liangjun He <he...@apache.org>
Signed-off-by: Xin Sun <dd...@gmail.com>
(cherry picked from commit 8b8c684bcc0060af0d9244dba86b6a46d2cdc30e)
---
.../apache/hadoop/hbase/filter/TestFuzzyRowFilterEndToEndLarge.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFuzzyRowFilterEndToEndLarge.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFuzzyRowFilterEndToEndLarge.java
index a8c7b7c9151..0305aad23e2 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFuzzyRowFilterEndToEndLarge.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFuzzyRowFilterEndToEndLarge.java
@@ -62,9 +62,9 @@ public class TestFuzzyRowFilterEndToEndLarge {
private final static byte fuzzyValue = (byte) 63;
- private static int firstPartCardinality = 50;
- private static int secondPartCardinality = 50;
- private static int thirdPartCardinality = 50;
+ private static int firstPartCardinality = 30;
+ private static int secondPartCardinality = 30;
+ private static int thirdPartCardinality = 30;
private static int colQualifiersTotal = 5;
private static int totalFuzzyKeys = thirdPartCardinality / 2;