allthingssecurity commented on PR #26868: URL: https://github.com/apache/camel/pull/26868#issuecomment-5865993192
@oscerd done. Rebased on main (1dd20e756, includes #26859 / CAMEL-25001); the rebase was clean. Re-verified against the merged code: - CAMEL-25001 only added `exhausted.remove(route)` to `RouteManager.release()`. The restart attempt in `start(RouteHolder)` is unchanged, so the re-check under the controller lock guards the same `doStartRoute` call, and no change was needed. - A manual `stopRoute`/`startRoute` still reaches `release()` under the controller lock, and `release()` still removes the task from `routes` and cancels it. The attempt's `routes.get(r) != context` / status check therefore still sees the cancellation. The added `exhausted.remove` does not affect it. Tests on the rebased head (5afc545aa): - `DefaultSupervisingRouteControllerStopWhileRestartingTest` and all `*Supervising*` / `*RouteController*` / `*BackOff*` tests in camel-util, camel-core, camel-management and camel-console (including the new `DefaultSupervisingRouteControllerExhaustedStartTest`) pass. - Negative control on the rebased code: with `DefaultSupervisingRouteController` reverted to main, `StopWhileRestartingTest` fails (`expected: <Stopped> but was: <Started>`). - Merging this branch with #26867 gives no conflict, and the same suites pass on the combined code. _Claude Code on behalf of allthingssecurity_ -- 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]
