Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove node if VM doesn't exist even if computer is not idle #552

Merged
merged 11 commits into from
Jul 23, 2024
Merged

Remove node if VM doesn't exist even if computer is not idle #552

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e0b1d41
Update AzureVMAgentCleanUpTask.java
Tyler-35 Jul 18, 2024
b71b9bd
adding echos
Tyler-35 Jul 18, 2024
375a2a5
Update AzureVMAgentCleanUpTask.java
Tyler-35 Jul 18, 2024
38a2fc6
updating
Tyler-35 Jul 18, 2024
0545853
updating
Tyler-35 Jul 18, 2024
9ee648e
updating
Tyler-35 Jul 18, 2024
31b4a55
updating
Tyler-35 Jul 22, 2024
4b39c29
updating
Tyler-35 Jul 23, 2024
af98773
updating
Tyler-35 Jul 23, 2024
445981d
changing the order of vm exist as this was causing issues with spot i…
Tyler-35 Jul 23, 2024
d9b8703
changing the order of idle check
Tyler-35 Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/main/java/com/microsoft/azure/vmagent/AzureVMAgentCleanUpTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,13 +476,6 @@
continue;
}

// If the machine is not idle, don't do anything.
// Could have been taken offline by the plugin while still running
// builds.
if (!azureComputer.isIdle()) {
continue;
}

// Even if offline, a machine that has been temporarily marked offline
// should stay (this could be for investigation).
if (azureComputer.isSetOfflineByUser()) {
Expand Down Expand Up @@ -513,6 +506,13 @@
continue;
}

// If the machine is not idle, don't do anything.
// Could have been taken offline by the plugin while still running
// builds.
if (!azureComputer.isIdle()) {
continue;

Check warning on line 513 in src/main/java/com/microsoft/azure/vmagent/AzureVMAgentCleanUpTask.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered lines 

Lines 512-513 are not covered by tests
}

// Machine exists but is in either DELETE or SHUTDOWN state.
// Execute that action.
Callable<Void> task = () -> {
Expand Down