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/08/09 01:58:56 UTC
[hbase] branch branch-2.5 updated (948b323075b -> 97d87b011fa)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a change to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
from 948b323075b HBASE-26775 - add synchronized modifier to the toString() method of ProcedureEvent.java (#4681)
new 45d7562c288 HBASE-27275 graceful_stop.sh unable to restore the balance state (#4680)
new 97d87b011fa HBASE-27282 CME in AuthManager causes region server crash (#4684)
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:
bin/graceful_stop.sh | 2 +-
.../main/java/org/apache/hadoop/hbase/security/access/AuthManager.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
[hbase] 01/02: HBASE-27275 graceful_stop.sh unable to restore the balance state (#4680)
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.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 45d7562c28866cf9749f12e106d33be45c3fe11a
Author: LiangJun He <20...@163.com>
AuthorDate: Tue Aug 9 09:48:51 2022 +0800
HBASE-27275 graceful_stop.sh unable to restore the balance state (#4680)
Signed-off-by: Duo Zhang <zh...@apache.org>
(cherry picked from commit b431652e48e7cd003c7f8cad4eb9e3065cb0b40f)
---
bin/graceful_stop.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/graceful_stop.sh b/bin/graceful_stop.sh
index fc18239830b..da3495b1d7b 100755
--- a/bin/graceful_stop.sh
+++ b/bin/graceful_stop.sh
@@ -115,7 +115,7 @@ if [ "$nob" == "true" ]; then
HBASE_BALANCER_STATE=false
else
log "Disabling load balancer"
- HBASE_BALANCER_STATE=$(echo 'balance_switch false' | "$bin"/hbase --config "${HBASE_CONF_DIR}" shell -n | tail -1)
+ HBASE_BALANCER_STATE=$(echo 'balance_switch false' | "$bin"/hbase --config "${HBASE_CONF_DIR}" shell -n | grep 'Previous balancer state' | awk -F": " '{print $2}')
log "Previous balancer state was $HBASE_BALANCER_STATE"
fi
[hbase] 02/02: HBASE-27282 CME in AuthManager causes region server crash (#4684)
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.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 97d87b011fa9912740de089fd2e9cbde423972ec
Author: chaijunjie0101 <64...@users.noreply.github.com>
AuthorDate: Tue Aug 9 09:52:31 2022 +0800
HBASE-27282 CME in AuthManager causes region server crash (#4684)
Signed-off-by: Duo Zhang <zh...@apache.org>
(cherry picked from commit d6641626a97529982720de2b73593e294869c4ca)
---
.../main/java/org/apache/hadoop/hbase/security/access/AuthManager.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AuthManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AuthManager.java
index 7f9853d8939..a24e9d66ced 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AuthManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AuthManager.java
@@ -19,7 +19,6 @@ package org.apache.hadoop.hbase.security.access;
import java.io.IOException;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -66,7 +65,7 @@ public final class AuthManager {
void put(String name, T perm) {
synchronized (mutex) {
- Set<T> perms = cache.getOrDefault(name, new HashSet<>());
+ Set<T> perms = cache.getOrDefault(name, ConcurrentHashMap.newKeySet());
perms.add(perm);
cache.put(name, perms);
}