This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 1c3855f7e69 branch-3.0: [fix](schema-change) Make sc job state updated
after the table state is changed (#42879)
1c3855f7e69 is described below
commit 1c3855f7e69929afc3d78a8e884a94de99109309
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Nov 7 14:07:04 2024 +0800
branch-3.0: [fix](schema-change) Make sc job state updated after the table
state is changed (#42879)
PR Body:
## Proposed changes
Similar to #39327
Note that schema change job state and table state should be atomic and
persistent, but neither is ensured by current implementation. We should
optimize this point in the future.
Cherry-picked from #42670
Co-authored-by: Siyang Tang
<82279870+tangsiyang2...@users.noreply.github.com>
---
.../src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
index bce1bcf4692..9ece02c876a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
@@ -656,14 +656,16 @@ public class SchemaChangeJobV2 extends AlterJobV2 {
}
pruneMeta();
- this.jobState = JobState.FINISHED;
- this.finishedTimeMs = System.currentTimeMillis();
- Env.getCurrentEnv().getEditLog().logAlterJob(this);
LOG.info("schema change job finished: {}", jobId);
changeTableState(dbId, tableId, OlapTableState.NORMAL);
LOG.info("set table's state to NORMAL, table id: {}, job id: {}",
tableId, jobId);
+
+ this.jobState = JobState.FINISHED;
+ this.finishedTimeMs = System.currentTimeMillis();
+ Env.getCurrentEnv().getEditLog().logAlterJob(this);
+
postProcessOriginIndex();
// Drop table column stats after schema change finished.
Env.getCurrentEnv().getAnalysisManager().dropStats(tbl, null);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
