database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](session-var) ignore exception when setting global only var in non master FE (#18949)

Browse Source 
Introduced from #18609.

When setting global variables from Non Master FE, there will be error like:

`Variable 'password_history' is a GLOBAL variable and should be set with SET GLOBAL`

Because when setting global variables from Non Master FE, Doris will do following step:

1. forward this SetStmt to Master FE to execute.
2. Change this SetStmt to "SESSION" level, and execute it again on this Non Master FE.

But for "GLOBAL only" variable, such ash "password_history", it doesn't allow to set on SESSION level.
So when doing step 2, "set password_history=xxx" without "GLOBAL" keywords will throw exception.
So in this case, we should just ignore this exception and return.
This commit is contained in:
Mingyu Chen
2023-04-25 11:05:09 +08:00
committed by GitHub
parent e2afa07271
commit 228cc90e4e
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
View File

@ -794,8 +794,9 @@ public class StmtExecutor implements ProfileWriter {
if (parsedStmt instanceof SetStmt) {
SetStmt setStmt = (SetStmt) parsedStmt;
setStmt.modifySetVarsForExecute();
SetExecutor executor = new SetExecutor(context, setStmt);
executor.execute();
for (SetVar var : setStmt.getSetVars()) {
VariableMgr.setVarForNonMasterFE(context.getSessionVariable(), var);
}
}
}

33
fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java
View File

@ -251,6 +251,33 @@ public class VariableMgr {
// setVar: variable information that needs to be set
public static void setVar(SessionVariable sessionVariable, SetVar setVar)
throws DdlException {
VarContext varCtx = setVarPreCheck(setVar);
checkUpdate(setVar, varCtx.getFlag());
setVarInternal(sessionVariable, setVar, varCtx);
}
// The only difference between setVar and setVarForNonMasterFE
// is that setVarForNonMasterFE will just return if "checkUpdate" throw exception.
// This is because, when setting global variables from Non Master FE, Doris will do following step:
// 1. forward this SetStmt to Master FE to execute.
// 2. Change this SetStmt to "SESSION" level, and execute it again on this Non Master FE.
// But for "GLOBAL only" variable, such ash "password_history", it doesn't allow to set on SESSION level.
// So when doing step 2, "set password_history=xxx" without "GLOBAL" keywords will throw exception.
// So in this case, we should just ignore this exception and return.
public static void setVarForNonMasterFE(SessionVariable sessionVariable, SetVar setVar)
throws DdlException {
VarContext varCtx = setVarPreCheck(setVar);
try {
checkUpdate(setVar, varCtx.getFlag());
} catch (DdlException e) {
LOG.debug("no need to set var for non master fe: {}", setVar.getVariable(), e);
return;
}
setVarInternal(sessionVariable, setVar, varCtx);
}
@NotNull
private static VarContext setVarPreCheck(SetVar setVar) throws DdlException {
String varName = setVar.getVariable();
boolean hasExpPrefix = false;
if (varName.startsWith(ExperimentalUtil.EXPERIMENTAL_PREFIX)) {
@ -265,9 +292,11 @@ public class VariableMgr {
if (hasExpPrefix && ctx.getField().getAnnotation(VarAttr.class).expType() == ExperimentalType.NONE) {
ErrorReport.reportDdlException(ErrorCode.ERR_UNKNOWN_SYSTEM_VARIABLE, setVar.getVariable());
}
// Check variable attribute and setVar
checkUpdate(setVar, ctx.getFlag());
return ctx;
}
private static void setVarInternal(SessionVariable sessionVariable, SetVar setVar, VarContext ctx)
throws DdlException {
// To modify to default value.
VarAttr attr = ctx.getField().getAnnotation(VarAttr.class);
String value;