This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new ad2876f7fee branch-3.1: [fix](blockrule)Fix concurrency issues in
SqlBlockRuleMgr after restart fe #58296 (#58407)
ad2876f7fee is described below
commit ad2876f7feef11e96dc9272c65efaaed0fe5f7b7
Author: zhangdong <[email protected]>
AuthorDate: Thu Nov 27 10:30:05 2025 +0800
branch-3.1: [fix](blockrule)Fix concurrency issues in SqlBlockRuleMgr after
restart fe #58296 (#58407)
picked from #58296
---
.../java/org/apache/doris/blockrule/SqlBlockRuleMgr.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/blockrule/SqlBlockRuleMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/blockrule/SqlBlockRuleMgr.java
index 8c9f265c94a..3356c75ec03 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/blockrule/SqlBlockRuleMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/blockrule/SqlBlockRuleMgr.java
@@ -31,6 +31,7 @@ import org.apache.doris.common.io.Writable;
import org.apache.doris.common.util.SqlBlockUtil;
import org.apache.doris.metric.MetricRepo;
import org.apache.doris.mysql.privilege.Auth;
+import org.apache.doris.persist.gson.GsonPostProcessable;
import org.apache.doris.persist.gson.GsonUtils;
import org.apache.doris.qe.ConnectContext;
@@ -53,7 +54,7 @@ import java.util.stream.Collectors;
/**
* Manage SqlBlockRule.
**/
-public class SqlBlockRuleMgr implements Writable {
+public class SqlBlockRuleMgr implements Writable, GsonPostProcessable {
private static final Logger LOG =
LogManager.getLogger(SqlBlockRuleMgr.class);
private ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
@@ -328,4 +329,13 @@ public class SqlBlockRuleMgr implements Writable {
String json = Text.readString(in);
return GsonUtils.GSON.fromJson(json, SqlBlockRuleMgr.class);
}
+
+ @Override
+ public void gsonPostProcess() throws IOException {
+ Map<String, SqlBlockRule> nameToSqlBlockRuleMapNew =
Maps.newConcurrentMap();
+ if (this.nameToSqlBlockRuleMap != null) {
+ nameToSqlBlockRuleMapNew.putAll(this.nameToSqlBlockRuleMap);
+ }
+ this.nameToSqlBlockRuleMap = nameToSqlBlockRuleMapNew;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
