Skip to content

[To dev/1.3] Retry failed procedure rollback without losing state - #18825

Merged
jt2594838 merged 1 commit into
apache:dev/1.3from
Caideyipi:backport/18822-procedure-rollback-dev-1.3
Oct 12, 2026
Merged

jt2594838 merged 1 commit into
apache:dev/1.3from
Caideyipi:backport/18822-procedure-rollback-dev-1.3

Conversation

@Caideyipi

Copy link
Copy Markdown
Collaborator

Description

Backport #18822 (2751ee133b46ae5d9a17b27de84eb86fa2ead239) to dev/1.3.

Failed rollbacks can opt into timeout retries while retaining their rollback state across serialization and preserving the original execution failure. Procedures rejected before receiving a persistent ID report their failure instead of a timeout.

Adapt executor logging to this branch and use reflection in the regression test to access its private waitingProcedureFinished method.

Validation

  • mvn spotless:apply -pl iotdb-core/confignode '-Ddevelocity.off=true'
  • mvn -nsu test -pl iotdb-core/confignode '-Dtest=STMProcedureTest,ProcedureManagerTest' '-Dsurefire.failIfNoSpecifiedTests=false' '-Ddevelocity.off=true'
    • 11 tests passed; no failures, errors, or skipped tests. Checkstyle and Spotless checks passed.
  • git diff --cached --check

This PR has:

  • been self-reviewed.
  • retained the upstream regression tests and adapted them to dev/1.3.

* Retry failed procedure rollback without losing state

* Fix missing TSStatusCode import in procedure manager test

(cherry picked from commit 2751ee1)
@jt2594838
jt2594838 merged commit c502479 into apache:dev/1.3 Oct 12, 2026
16 checks passed
@jt2594838
jt2594838 deleted the backport/18822-procedure-rollback-dev-1.3 branch October 12, 2026 06:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants