Skip to content

branch-3.1: [fix](config) fix admin set all frontends config #55016 #55072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morrySnow merged 1 commit into from
Aug 21, 2025
Merged

branch-3.1: [fix](config) fix admin set all frontends config #55016 #55072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fe/fe-core/src/main/java/org/apache/doris/analysis/AdminSetConfigStmt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public RedirectStatus getRedirectStatus() {
public OriginStatement getLocalSetStmt() {
OriginStatement stmt = this.getOrigStmt();
Object[] keyArr = configs.keySet().toArray();
String sql = String.format("ADMIN SET FRONTEND CONFIG (\"%s\" = \"%s\");",
String sql = String.format("ADMIN SET %s CONFIG (\"%s\" = \"%s\");", applyToAll ? "ALL FRONTENDS" : "FRONTEND",
keyArr[0].toString(), configs.get(keyArr[0].toString()));

return new OriginStatement(sql, stmt.idx);
Expand Down
5 changes: 3 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6136,7 +6136,7 @@ public void setMutableConfigWithCallback(String key, String value) throws Config
}
}

public void setConfig(AdminSetConfigStmt stmt) throws Exception {
public void setConfig(AdminSetConfigStmt stmt, boolean isProxy) throws Exception {
Map<String, String> configs = stmt.getConfigs();
Preconditions.checkState(configs.size() == 1);

Expand All @@ -6148,7 +6148,8 @@ public void setConfig(AdminSetConfigStmt stmt) throws Exception {
}
}

if (stmt.isApplyToAll()) {
// if this request already come from other Frontend, do not forward it again
if (!isProxy && stmt.isApplyToAll()) {
for (Frontend fe : Env.getCurrentEnv().getFrontends(null /* all */)) {
if (!fe.isAlive() || fe.getHost().equals(Env.getCurrentEnv().getSelfNode().getHost())) {
continue;
Expand Down
6 changes: 5 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,10 @@ public class DdlExecutor {
* Execute ddl.
**/
public static void execute(Env env, DdlStmt ddlStmt) throws Exception {
execute(env, ddlStmt, false);
}

public static void execute(Env env, DdlStmt ddlStmt, boolean isProxy) throws Exception {
checkDdlStmtSupported(ddlStmt);
if (ddlStmt instanceof CreateDbStmt) {
env.createDb((CreateDbStmt) ddlStmt);
Expand Down Expand Up @@ -297,7 +301,7 @@ public static void execute(Env env, DdlStmt ddlStmt) throws Exception {
} else if (ddlStmt instanceof AdminCompactTableStmt) {
env.compactTable((AdminCompactTableStmt) ddlStmt);
} else if (ddlStmt instanceof AdminSetConfigStmt) {
env.setConfig((AdminSetConfigStmt) ddlStmt);
env.setConfig((AdminSetConfigStmt) ddlStmt, isProxy);
} else if (ddlStmt instanceof AdminSetTableStatusStmt) {
env.setTableStatus((AdminSetTableStatusStmt) ddlStmt);
} else if (ddlStmt instanceof CreateFileStmt) {
Expand Down
2 changes: 1 addition & 1 deletion fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3168,7 +3168,7 @@ private void handleDeleteStmt() {

private void handleDdlStmt() {
try {
DdlExecutor.execute(context.getEnv(), (DdlStmt) parsedStmt);
DdlExecutor.execute(context.getEnv(), (DdlStmt) parsedStmt, isProxy);
if (!(parsedStmt instanceof AnalyzeStmt)) {
context.getState().setOk();
}
Expand Down
23 changes: 19 additions & 4 deletions fe/fe-core/src/test/java/org/apache/doris/analysis/AdminSetConfigStmtTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,16 @@ public class AdminSetConfigStmtTest extends TestWithFeService {
public void testNormal() throws Exception {
String stmt = "admin set frontend config(\"alter_table_timeout_second\" = \"60\");";
AdminSetConfigStmt adminSetConfigStmt = (AdminSetConfigStmt) parseAndAnalyzeStmt(stmt);
Env.getCurrentEnv().setConfig(adminSetConfigStmt);
Env.getCurrentEnv().setConfig(adminSetConfigStmt, false);
Assertions.assertTrue(adminSetConfigStmt.getLocalSetStmt().originStmt.startsWith("ADMIN SET FRONTEND CONFIG"));
}

@Test
public void testUnknownConfig() throws Exception {
String stmt = "admin set frontend config(\"unknown_config\" = \"unknown\");";
AdminSetConfigStmt adminSetConfigStmt = (AdminSetConfigStmt) parseAndAnalyzeStmt(stmt);
DdlException exception = Assertions.assertThrows(DdlException.class,
() -> Env.getCurrentEnv().setConfig(adminSetConfigStmt));
() -> Env.getCurrentEnv().setConfig(adminSetConfigStmt, false));
Assertions.assertEquals("errCode = 2, detailMessage = Config 'unknown_config' does not exist",
exception.getMessage());
}
Expand All @@ -66,14 +67,14 @@ public void testExperimentalConfig() throws Exception {
boolean enableMtmv = Config.enable_mtmv;
String stmt = "admin set frontend config('enable_mtmv' = '" + String.valueOf(!enableMtmv) + "');";
AdminSetConfigStmt adminSetConfigStmt = (AdminSetConfigStmt) parseAndAnalyzeStmt(stmt);
Env.getCurrentEnv().setConfig(adminSetConfigStmt);
Env.getCurrentEnv().setConfig(adminSetConfigStmt, false);
Assert.assertNotEquals(enableMtmv, Config.enable_mtmv);

// 2. set with experimental
enableMtmv = Config.enable_mtmv;
stmt = "admin set frontend config('experimental_enable_mtmv' = '" + String.valueOf(!enableMtmv) + "');";
adminSetConfigStmt = (AdminSetConfigStmt) parseAndAnalyzeStmt(stmt);
Env.getCurrentEnv().setConfig(adminSetConfigStmt);
Env.getCurrentEnv().setConfig(adminSetConfigStmt, false);
Assert.assertNotEquals(enableMtmv, Config.enable_mtmv);

// 3. show config
Expand All @@ -89,5 +90,19 @@ public void testExperimentalConfig() throws Exception {
results = ConfigBase.getConfigInfo(matcher);
Assert.assertEquals(num, results.size());
}

@Test
public void testSetAllFrontendsConfig() throws Exception {
String stmt = "admin set all frontends config(\"alter_table_timeout_second\" = \"77\");";
AdminSetConfigStmt adminSetConfigStmt = (AdminSetConfigStmt) parseAndAnalyzeStmt(stmt);

Assertions.assertTrue(adminSetConfigStmt.isApplyToAll());
Assertions.assertEquals(adminSetConfigStmt.getRedirectStatus(), RedirectStatus.NO_FORWARD);
Assertions.assertTrue(
adminSetConfigStmt.getLocalSetStmt().originStmt.startsWith("ADMIN SET ALL FRONTENDS CONFIG"));

Env.getCurrentEnv().setConfig(adminSetConfigStmt, true);
Assertions.assertEquals(77, Config.alter_table_timeout_second);
}
}