shuke987 opened a new pull request, #65209:
URL: https://github.com/apache/doris/pull/65209
### What problem does this PR solve?
Issue Number: close #xxx
Related PR: #64945
Problem Summary:
`trigger_and_wait_compaction` has special handling for cumulative compaction
that meets delete-version rowsets and reports `E-2010`. PR #64945 made the
helper wait for base compaction success before treating that handoff as
finished.
Build `985491` exposed another valid timing window in
`compaction/test_compaction_agg_keys_with_delete.groovy`: for tablet
`1783077858744`, base success was already visible in the cached old tablet
status, while cumulative success advanced later.
The final polled state was not stuck:
- `run_status=false`
- `cumulative point` advanced from `7` to `12`
- `last cumulative status` changed to `[E-2010]cumulative compaction meet
delete version`
- `last cumulative success time` advanced from `2026-07-03 19:46:16.439` to
`2026-07-03 19:46:16.945`
- rowsets were compacted from separate `[8-8]`, `[9-9]`, `[10-10]` rowsets
to `[8-10]`
However, the helper only accepted the E-2010 handoff when `last base success
time` changed after the cached old status. In this timing window that timestamp
did not change, so the helper kept returning "still running" until the 5-minute
Awaitility timeout.
This patch keeps the previous safety guard: E-2010 plus cumulative point
movement alone is still not enough. It now accepts the handoff when either base
success time changes or cumulative success time changes, so a pure E-2010
failure timestamp change is not treated as completion.
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [x] Manual test (add detailed scripts or steps below)
- `git diff --check`
- Local Groovy condition simulation for the build `985491` final
tablet state: passes with `baseSuccessTimeChanged=false` and
`cumulativeSuccessTimeChanged=true`.
- Local Groovy negative simulation: E-2010 plus cumulative point
movement without base/cumulative success time change is still not treated as
completion.
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [x] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [x] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR should
merge into -->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]