Skip to content

Catch getByName exception in case cloud name is not an openstack cloud #433

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
simonelbaz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Catch getByName exception in case cloud name is not an openstack cloud #433

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
14 changes: 10 additions & 4 deletions plugin/src/main/java/jenkins/plugins/openstack/compute/JCloudsCleanupThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,11 @@ private void setCloudLastCleanTime() {

private void terminateNodesPendingDeletion() {
for (final JCloudsComputer comp : JCloudsComputer.getAll()) {
JCloudsCloud cloud = JCloudsCloud.getByName(comp.getId().getCloudName());
if ((System.currentTimeMillis() - cloud.getLastCleanTime()) < cloud.getCleanfreqToMillis()) continue;
try {
JCloudsCloud cloud = JCloudsCloud.getByName(comp.getId().getCloudName());
if ((System.currentTimeMillis() - cloud.getLastCleanTime()) < cloud.getCleanfreqToMillis()) continue;
} catch (IllegalArgumentException e) {
}
if (!comp.isIdle()) continue;

final OfflineCause offlineCause = comp.getNode().getFatalOfflineCause();
Expand Down Expand Up @@ -195,8 +198,11 @@ private void deleteComputer(JCloudsComputer comp, CauseOfInterruption coi) {
private void terminatesNodesWithoutServers(@Nonnull HashMap<JCloudsCloud, List<Server>> runningServers) {
Map<String, JCloudsComputer> jenkinsComputers = new HashMap<>();
for (JCloudsComputer computer : JCloudsComputer.getAll()) {
JCloudsCloud cloud = JCloudsCloud.getByName(computer.getId().getCloudName());
if ((System.currentTimeMillis() - cloud.getLastCleanTime()) < cloud.getCleanfreqToMillis()) continue;
try {
JCloudsCloud cloud = JCloudsCloud.getByName(computer.getId().getCloudName());
if ((System.currentTimeMillis() - cloud.getLastCleanTime()) < cloud.getCleanfreqToMillis()) continue;
} catch (IllegalArgumentException e) {
}

JCloudsSlave node = computer.getNode();
if (node != null) {
Expand Down
Loading