Skip to content

Restructured CpsFlowExecution.suspendAll#1088

Merged
jglick merged 4 commits intojenkinsci:masterfrom
jglick:suspendAll
Sep 23, 2025
Merged

Restructured CpsFlowExecution.suspendAll#1088
jglick merged 4 commits intojenkinsci:masterfrom
jglick:suspendAll

Conversation

@jglick
Copy link
Member

@jglick jglick commented Sep 22, 2025

Not yet tested under realistic conditions. Amending #866 & #923.

@jglick jglick added the bug label Sep 22, 2025
@gbhat618
Copy link
Contributor

gbhat618 commented Sep 23, 2025

Tested in context of CloudBees CI, when 1k builds are running, now it is taking approx 8-12s (previously > 40s),
After restart all builds resumed and all builds success. (ran the test thrice, total 15k builds were executed on k8s agents)

private void suspend() {
try {
var nonresumable = checkAndAbortNonresumableBuild();
// Like waitForSuspension but with a timeout:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(ignore WS)

@jglick jglick marked this pull request as ready for review September 23, 2025 11:23
@jglick jglick requested a review from a team as a code owner September 23, 2025 11:24
Copy link
Member

@jtnord jtnord left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems ok, some comments inline

Comment on lines +986 to +987
// normally would be 8/16 builds, but could be subject to timing conditions
assertThat(logger, LoggerRule.recorded(Level.WARNING, containsString("builds did not finish suspending")));
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

currently

18.694 [id=57]	WARNING	o.j.p.w.cps.CpsFlowExecution#suspendAll: 8/16 builds did not finish suspending within 10 seconds

@jglick jglick enabled auto-merge September 23, 2025 13:19
@jglick jglick merged commit 2894bcd into jenkinsci:master Sep 23, 2025
16 of 17 checks passed
@jglick jglick deleted the suspendAll branch September 23, 2025 13:43
@jglick
Copy link
Member Author

jglick commented Sep 23, 2025

Deployment is blocked by jenkins-infra/helpdesk#4799 it seems.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants