Skip to content

[Bug] Fix bug that failed to write meta image of load job #5029

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
yangzhg merged 1 commit into from
Dec 8, 2020
Merged

[Bug] Fix bug that failed to write meta image of load job #5029

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
3 changes: 3 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/UserIdentity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,15 @@ public class UserIdentity implements Writable {

public static final UserIdentity ROOT;
public static final UserIdentity ADMIN;
public static final UserIdentity UNKNOWN;

static {
ROOT = new UserIdentity(PaloAuth.ROOT_USER, "%");
ROOT.setIsAnalyzed();
ADMIN = new UserIdentity(PaloAuth.ADMIN_USER, "%");
ADMIN.setIsAnalyzed();
UNKNOWN = new UserIdentity(PaloAuth.UNKNOWN_USER, "%");
UNKNOWN.setIsAnalyzed();
}

private UserIdentity() {
Expand Down
14 changes: 6 additions & 8 deletions fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BulkLoadJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@
import org.apache.doris.transaction.TabletCommitInfo;
import org.apache.doris.transaction.TransactionState;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
Expand Down Expand Up @@ -340,8 +340,10 @@ public void readFields(DataInput in) throws IOException {

if (Catalog.getCurrentCatalogJournalVersion() >= FeMetaVersion.VERSION_93) {
userInfo = UserIdentity.read(in);
// must set is as analyzed, because when write the user info to meta image, it will be checked.
userInfo.setIsAnalyzed();
} else {
userInfo = new UserIdentity("","");
userInfo = UserIdentity.UNKNOWN;
}
if (Catalog.getCurrentCatalogJournalVersion() >= FeMetaVersion.VERSION_66) {
int size = in.readInt();
Expand All @@ -359,8 +361,4 @@ public void readFields(DataInput in) throws IOException {
public UserIdentity getUserInfo() {
return userInfo;
}

public void setUserInfo(UserIdentity userInfo) {
this.userInfo = userInfo;
}
}
8 changes: 5 additions & 3 deletions fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PaloAuth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@
import org.apache.doris.thrift.TFetchResourceResult;
import org.apache.doris.thrift.TPrivilegeStatus;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
Expand All @@ -68,6 +68,8 @@ public class PaloAuth implements Writable {
// each Palo system has only one root user.
public static final String ROOT_USER = "root";
public static final String ADMIN_USER = "admin";
// unknown user does not have any privilege, this is just to be compatible with old version.
public static final String UNKNOWN_USER = "unknown";

private UserPrivTable userPrivTable = new UserPrivTable();
private DbPrivTable dbPrivTable = new DbPrivTable();
Expand Down