From 34b23235f9f5f11d1d3ef0a36a667f2af412251b Mon Sep 17 00:00:00 2001 From: Simon ELBAZ Date: Mon, 16 Jun 2025 23:40:46 +0200 Subject: [PATCH] Catch getByName exception in case cloud name is not an openstack cloud --- .../openstack/compute/JCloudsCleanupThread.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/plugin/src/main/java/jenkins/plugins/openstack/compute/JCloudsCleanupThread.java b/plugin/src/main/java/jenkins/plugins/openstack/compute/JCloudsCleanupThread.java index bba8cb86..7ff1b164 100644 --- a/plugin/src/main/java/jenkins/plugins/openstack/compute/JCloudsCleanupThread.java +++ b/plugin/src/main/java/jenkins/plugins/openstack/compute/JCloudsCleanupThread.java @@ -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(); @@ -195,8 +198,11 @@ private void deleteComputer(JCloudsComputer comp, CauseOfInterruption coi) { private void terminatesNodesWithoutServers(@Nonnull HashMap> runningServers) { Map 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) {