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

[fix](schema-change) Fix potential data race when a schema change jobs is set to cancelled but the table state is still SCHEMA_CHANGE (#39164) (#39327)

Browse Source 
## Proposed changes

Set job cancel state after table state changed to normal.
This commit is contained in:
Siyang Tang
2024-08-15 14:18:11 +08:00
committed by GitHub
parent aebc70d75a
commit 642beb069b
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
View File

@ -657,7 +657,7 @@ public class SchemaChangeJobV2 extends AlterJobV2 {
tbl.getIndexMetaByIndexId(shadowIdxId).setMaxColUniqueId(maxColUniqueId);
if (LOG.isDebugEnabled()) {
LOG.debug("originIdxId:{}, shadowIdxId:{}, maxColUniqueId:{}, indexSchema:{}",
originIdxId, shadowIdxId, maxColUniqueId, indexSchemaMap.get(shadowIdxId));
originIdxId, shadowIdxId, maxColUniqueId, indexSchemaMap.get(shadowIdxId));
}
tbl.deleteIndexInfo(originIdxName);
@ -704,12 +704,11 @@ public class SchemaChangeJobV2 extends AlterJobV2 {
pruneMeta();
this.errMsg = errMsg;
this.finishedTimeMs = System.currentTimeMillis();
LOG.info("cancel {} job {}, err: {}", this.type, jobId, errMsg);
Env.getCurrentEnv().getEditLog().logAlterJob(this);
changeTableState(dbId, tableId, OlapTableState.NORMAL);
LOG.info("set table's state to NORMAL when cancel, table id: {}, job id: {}", tableId, jobId);
jobState = JobState.CANCELLED;
Env.getCurrentEnv().getEditLog().logAlterJob(this);
LOG.info("cancel {} job {}, err: {}", this.type, jobId, errMsg);
return true;
}
@ -745,8 +744,6 @@ public class SchemaChangeJobV2 extends AlterJobV2 {
}
}
}
jobState = JobState.CANCELLED;
}
// Check whether transactions of the given database which txnId is less than 'watershedTxnId' are finished.