Skip to content

Handle launcher failures by running the disconnect logic #121

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

Open
nhunsperger wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle launcher failures by running the disconnect logic #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions src/main/java/org/jenkinsci/plugins/vSphereCloudLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import hudson.model.Descriptor;
import hudson.slaves.ComputerLauncher;
import hudson.slaves.DelegatingComputerLauncher;
import hudson.slaves.OfflineCause;
import hudson.slaves.SlaveComputer;

import java.io.IOException;
Expand Down Expand Up @@ -244,6 +245,10 @@ public void launch(SlaveComputer slaveComputer, TaskListener taskListener)
}
vSphereCloud.Log(slaveComputer, taskListener, "Asking " + launcher.getClass().getSimpleName() + " to launch slave.");
super.launch(slaveComputer, taskListener);
if (!slaveComputer.isOnline()) {
vSphereCloud.Log(slaveComputer, taskListener, "Failed to launch agent");
throw new IOException("Failed to launch agent");
}
} else {
vSphereCloud.Log(slaveComputer, taskListener, "Waiting for up to " + launchDelay
+ " seconds for slave to come online.");
Expand All @@ -263,7 +268,8 @@ public void launch(SlaveComputer slaveComputer, TaskListener taskListener)
} catch (final Exception e) {
vSphereCloud.Log(slaveComputer, taskListener, e, "EXCEPTION while starting VM");
vsC.markVMOffline(slaveComputer.getDisplayName(), vmName);
throw new RuntimeException(e);
slaveComputer.disconnect(new OfflineCause.LaunchFailed());
return;
} finally {
vSphereCloudSlave.RemoveProbableLaunch(vsSlave);
vsSlave.slaveIsStarting = Boolean.FALSE;
Expand Down Expand Up @@ -359,18 +365,17 @@ public synchronized void afterDisconnect(SlaveComputer slaveComputer, TaskListen
revertVM(vm, vsC, slaveComputer, taskListener);
resetVM(vm, slaveComputer, taskListener);
break;
case RECONNECT_AND_REVERT:
reconnect = true;
break;
case NOTHING:
case SUSPEND:
case SHUTDOWN:
case RESET:
default:
break;
}
} else {
// VM is already powered down.
}

// Reconnect and Revert is independent of VM power state
if(localIdle == MACHINE_ACTION.RECONNECT_AND_REVERT) {
reconnect = true;
}
}
vSphereCloud.Log(slaveComputer, taskListener, "Idle action %s complete.", localIdle);
} catch (Throwable t) {
Expand Down