Make ExecutorPickle wait on EphemeralNodes when trying to resume, restoring original behavior of fix to JENKINS-36013 #48
Conversation
…toring original behavior of fix to JENKINS-36013
|
This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation. |
| Queue.getInstance().cancel(item); | ||
| if (isEphemeral()) { |
There was a problem hiding this comment.
Then you might as well delete the ephemeral flag.
There was a problem hiding this comment.
I'd like to keep that info handy for future use, plus it avoids grumping from XStream because the field no longer exists.
|
@jglick The exact required behavior of EphemeralNodes is pretty poorly defined - the node itself may not be persistent with regard to the master but there's nothing to prevent it from being recreated once removed (as Swarm plugin does when nodes reconnect). The safest thing to do is to ensure we're not prematurely terminating builds and just use the original grace period -- there's no guarantee there are no other oddball implementations. |
|
Suggest developing automated tests in |
|
Amends #47 FTR. |
Per comment here, immediately failing builds with an ExecutorPickle that depends on an EphemeralNode is not safe to do, due to the Swarm Plugin. Documented in the JIRA comments.
So, I am restoring my original behavior (apply a timeout in all cases). Can't remove the new field, though.
@reviewbybees CC @jglick