This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new ab27598511c [fix](auth)Fix concurrency issue during role manager
upgrade (#42419)
ab27598511c is described below
commit ab27598511ce5c65e337a64b8b16d2abf4fa30cd
Author: zhangdong <[email protected]>
AuthorDate: Mon Nov 4 13:53:40 2024 +0800
[fix](auth)Fix concurrency issue during role manager upgrade (#42419)
Change the map to a concurrency safe map，because there is a possibility
of concurrent read and write operations
For example, when a node performs the rectifyPrivs operation, it needs
to traverse 'roles' and may be adding or deleting roles at the same time
---
.../src/main/java/org/apache/doris/mysql/privilege/RoleManager.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/RoleManager.java
b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/RoleManager.java
index f1db573eac5..46949ef4739 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/RoleManager.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/RoleManager.java
@@ -54,6 +54,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -64,7 +65,7 @@ public class RoleManager implements Writable,
GsonPostProcessable {
// Concurrency control is delegated by Auth, so not concurrentMap
@SerializedName(value = "roles")
- private Map<String, Role> roles = Maps.newHashMap();
+ private ConcurrentMap<String, Role> roles = Maps.newConcurrentMap();
public RoleManager() {
roles.put(Role.OPERATOR.getRoleName(), Role.OPERATOR);
@@ -320,7 +321,7 @@ public class RoleManager implements Writable,
GsonPostProcessable {
// should be removed after version 3.0
private void removeClusterPrefix() {
- Map<String, Role> newRoles = Maps.newHashMap();
+ ConcurrentMap<String, Role> newRoles = Maps.newConcurrentMap();
for (Map.Entry<String, Role> entry : roles.entrySet()) {
String roleName =
ClusterNamespace.getNameFromFullName(entry.getKey());
newRoles.put(roleName, entry.getValue());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
