Merge branch 'fix/ZSTAC-82138' into '5.5.6'

gitlab · gitlab · commit 1d419214d652 · 2026-02-11T17:05:33.000Z
&lt;fix&gt;[longjob]: ZSTAC-82138 preserve apiId on LongJob rerun

See merge request zstackio/zstack!9151
diff --git a/longjob/src/main/java/org/zstack/longjob/LongJobManagerImpl.java b/longjob/src/main/java/org/zstack/longjob/LongJobManagerImpl.java
@@ -581,7 +581,6 @@ private void handle(SubmitLongJobMsg msg) {
                 progRpt.deleteTaskProgress(oldApiId);
             }
 
-            vo.setApiId(ThreadContext.getImmutableContext().get(Constants.THREAD_CONTEXT_API));
             vo.setState(LongJobState.Waiting);
             vo.setExecuteTime(null);
             vo.setManagementNodeUuid(Platform.getManagementServerId());

Original file line number	Diff line number	Diff line change
`@@ -581,7 +581,6 @@ private void handle(SubmitLongJobMsg msg) {`
`581`	`581`	`progRpt.deleteTaskProgress(oldApiId);`
`582`	`582`	`}`
`583`	`583`
`584`		`- vo.setApiId(ThreadContext.getImmutableContext().get(Constants.THREAD_CONTEXT_API));`
`585`	`584`	`vo.setState(LongJobState.Waiting);`
`586`	`585`	`vo.setExecuteTime(null);`
`587`	`586`	`vo.setManagementNodeUuid(Platform.getManagementServerId());`