[JENKINS-44796] Retry deletion of unwanted VMs#77
Merged
pjdarton merged 3 commits intojenkinsci:masterfrom Jul 28, 2017
Merged
Conversation
When CloudProvisioningAlgorithm, CloudProvisioningRecord and CloudProvisioningState were added, they were mistakenly added with CRLF end of line codes, which makes future "diff" operations difficult (as they often show as "entire file contents removed and replaced with new file contents"). This commit changes the end-of-line codes from CRLF to LF - no other changes made.
Not every attempt to communicate with vSphere succeeds. Sometimes we fail to create a VM, sometimes we fail to destroy a VM. If we fail to create one, the existing logic will try again, as Jenkins will keep asking for new VMs. If we failed to delete one, we used to merely log the failure exception and then forget about it, which could result in unused VMs running in vSphere. This code change adds extra in-memory state so that we remember a list of all the VMs that we want to delete until we are sure that we have deleted them, and we keep trying to delete unwanted VMs until we've got rid of them.
JENKINS-42187 applies to us too; same cause, same fix. So we avoid trying to delete VMs in-line with the slave's terminate method and instead schedule deletion for later.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Not every attempt to communicate with vSphere succeeds. Sometimes we fail to create a VM, sometimes we fail to destroy a VM. If we fail to create one, the existing logic will try again, as Jenkins will keep asking for new VMs.
If we failed to delete one, we used to merely log the failure exception and then forget about it, which could result in unused VMs running in vSphere.
This code change adds extra in-memory state so that we remember a list of all the VMs that we want to delete until we are sure that we have deleted them, and we keep trying to delete unwanted VMs until we've got rid of them.