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

[fix](user) Avoid throw unknown UserProperty after FE rollback version (#28325)

Browse Source 
After using SET PROPERTY to modify the user property, if FE rolls back to a version without this property, `Unknown user property` error will be reported when replay EditLog, just ignore it.
This commit is contained in:
Xinyi Zou
2023-12-13 16:00:04 +08:00
committed by GitHub
parent 5f66335e54
commit 2005fee430
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/Auth.java
View File

@ -954,7 +954,7 @@ public class Auth implements Writable {
throws UserException {
writeLock();
try {
propertyMgr.updateUserProperty(user, properties);
propertyMgr.updateUserProperty(user, properties, isReplay);
if (!isReplay) {
UserPropertyInfo propertyInfo = new UserPropertyInfo(user, properties);
Env.getCurrentEnv().getEditLog().logUpdateUserProperty(propertyInfo);

20
fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java
View File

@ -37,6 +37,8 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.DataInput;
import java.io.DataOutput;
@ -51,8 +53,13 @@ import java.util.regex.Pattern;
/*
* UserProperty contains properties set for a user
* This user is just qualified by cluster name, not host which it connected from.
*
* If UserProperty and SessionVeriable have the same name, UserProperty has a higher priority than SessionVeriable.
* This usually means that the cluster administrator force user restrictions.
* Users cannot modify these SessionVeriables with the same name.
*/
public class UserProperty implements Writable {
private static final Logger LOG = LogManager.getLogger(UserProperty.class);
// advanced properties
private static final String PROP_MAX_USER_CONNECTIONS = "max_user_connections";
private static final String PROP_MAX_QUERY_INSTANCES = "max_query_instances";
@ -173,6 +180,10 @@ public class UserProperty implements Writable {
}
public void update(List<Pair<String, String>> properties) throws UserException {
update(properties, false);
}
public void update(List<Pair<String, String>> properties, boolean isReplay) throws UserException {
// copy
long newMaxConn = this.commonProperties.getMaxConn();
long newMaxQueryInstances = this.commonProperties.getMaxQueryInstances();
@ -312,7 +323,14 @@ public class UserProperty implements Writable {
}
workloadGroup = value;
} else {
throw new DdlException("Unknown user property(" + key + ")");
if (isReplay) {
// After using SET PROPERTY to modify the user property, if FE rolls back to a version without
// this property, `Unknown user property` error will be reported when replay EditLog,
// just ignore it.
LOG.warn("Unknown user property(" + key + "), maybe FE rolled back version, Ignore it");
} else {
throw new DdlException("Unknown user property(" + key + ")");
}
}
}

5
fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserPropertyMgr.java
View File

@ -73,13 +73,14 @@ public class UserPropertyMgr implements Writable {
}
}
public void updateUserProperty(String user, List<Pair<String, String>> properties) throws UserException {
public void updateUserProperty(String user, List<Pair<String, String>> properties, boolean isReplay)
throws UserException {
UserProperty property = propertyMap.get(user);
if (property == null) {
throw new DdlException("Unknown user(" + user + ")");
}
property.update(properties);
property.update(properties, isReplay);
}
public int getQueryTimeout(String qualifiedUser) {