Fix scaling issues and force private IP usage when usePrivateIP is set (

#636) * Fix fleet scaling with shutdownOnIdle by cleaning up temporaryOffline state * Ensure private IP is always used when usePrivateIP is set * Prevent premature VM shutdown during initial VM creation for shutdownOnIdle
jenkinsci · Feb 14, 2025 · 3f8b46d · 3f8b46d
1 parent a3819d7
commit 3f8b46d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/com/microsoft/azure/vmagent/AzureVMCloud.java b/src/main/java/com/microsoft/azure/vmagent/AzureVMCloud.java
@@ -691,6 +691,7 @@ public Collection<PlannedNode> provision(CloudState cloudState, int workLoad) {
                                                     getServiceDelegate().setVirtualMachineDetails(
                                                             agentNode, template);
                                                     Jenkins.get().addNode(agentNode);
+                                                    azureComputer.setTemporaryOfflineCause(null);
                                                     if (agentNode.getAgentLaunchMethod().equalsIgnoreCase("SSH")) {
                                                         retrySshConnect(azureComputer);
                                                     } else { // Wait until node is online

diff --git a/src/main/java/com/microsoft/azure/vmagent/AzureVMCloudBaseRetentionStrategy.java b/src/main/java/com/microsoft/azure/vmagent/AzureVMCloudBaseRetentionStrategy.java
@@ -19,7 +19,7 @@ public void resetShutdownVMStatus(final AzureVMAgent agent) {
             Computer.threadPoolForRemoting.submit(new Runnable() {
                 @Override
                 public void run() {
-                    if (agent.getTemplate().isShutdownOnIdle()) {
+                    if (agent.getTemplate().isShutdownOnIdle() && !agent.isCleanUpBlocked()) {
                         agent.setEligibleForReuse(false);
                         agent.shutdown(agent.getCleanUpReason());
                         agent.blockCleanUpAction();

diff --git a/src/main/java/com/microsoft/azure/vmagent/AzureVMManagementServiceDelegate.java b/src/main/java/com/microsoft/azure/vmagent/AzureVMManagementServiceDelegate.java
@@ -1169,9 +1169,9 @@ public void setVirtualMachineDetails(
         String publicIPStr = "";
         String privateIP = vm.getPrimaryNetworkInterface().primaryPrivateIP();
         String fqdn;
-        if (publicIP == null) {
+        if (publicIP == null || template.getUsePrivateIP()) {
             fqdn = privateIP;
-            LOGGER.log(Level.INFO, "The Azure agent doesn't have a public IP. Will use the private IP");
+            LOGGER.log(Level.INFO, "The Azure agent doesn't have a public IP or usePrivateIP is set. Will use the private IP");
         } else {
             fqdn = publicIP.fqdn();
             publicIPStr = publicIP.ipAddress();