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

[fix](load) fix wrong assert and cancel load error (#35362)

Browse Source
This commit is contained in:
Mingyu Chen
2024-05-24 17:11:01 +08:00
committed by GitHub
parent 1e07971a98
commit ca86ee7b15
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
View File

@ -2587,7 +2587,6 @@ public class Coordinator implements CoordInterface {
icebergCommitDataFunc.accept(params.getIcebergCommitDatas());
}
Preconditions.checkArgument(params.isSetDetailedReport());
if (ctx.done) {
if (LOG.isDebugEnabled()) {
LOG.debug("Query {} fragment {} is marked done",

8
fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
View File

@ -125,6 +125,7 @@ import org.apache.doris.catalog.EncryptKeyHelper;
import org.apache.doris.catalog.Env;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.util.ProfileManager;
import org.apache.doris.job.exception.JobException;
import org.apache.doris.load.sync.SyncJobManager;
import org.apache.doris.persist.CleanQueryStatsInfo;
import org.apache.doris.statistics.StatisticsRepository;
@ -177,8 +178,11 @@ public class DdlExecutor {
} else if (ddlStmt instanceof CancelLoadStmt) {
CancelLoadStmt cs = (CancelLoadStmt) ddlStmt;
// cancel all
env.getJobManager().cancelLoadJob(cs);
env.getLoadManager().cancelLoadJob(cs);
try {
env.getJobManager().cancelLoadJob(cs);
} catch (JobException e) {
env.getLoadManager().cancelLoadJob(cs);
}
} else if (ddlStmt instanceof CreateRoutineLoadStmt) {
env.getRoutineLoadManager().createRoutineLoadJob((CreateRoutineLoadStmt) ddlStmt);
} else if (ddlStmt instanceof PauseRoutineLoadStmt) {