From 30b707c45a216e4b0c3e8868c1ff44179256de0f Mon Sep 17 00:00:00 2001 From: James Peru Date: Sat, 21 Feb 2026 22:49:53 +0300 Subject: [PATCH 1/2] Fix NPE in NASBackupProvider when no running KVM host is available ResourceManager.findOneRandomRunningHostByHypervisor() can return null when no KVM host in the zone has status=Up (e.g. during management server startup, brief agent disconnections, or host state transitions). NASBackupProvider.syncBackupStorageStats() and deleteBackup() call host.getId() without a null check, causing a NullPointerException that crashes the entire BackupSyncTask background job every sync interval. This adds null checks in both methods: - syncBackupStorageStats: log a warning and return early - deleteBackup: throw CloudRuntimeException with a descriptive message --- .../apache/cloudstack/backup/NASBackupProvider.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java index f2ea8ac71c91..f4bd0911878c 100644 --- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java +++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java @@ -471,6 +471,9 @@ public boolean deleteBackup(Backup backup, boolean forced) { } else { host = resourceManager.findOneRandomRunningHostByHypervisor(Hypervisor.HypervisorType.KVM, backup.getZoneId()); } + if (host == null) { + throw new CloudRuntimeException(String.format("Unable to find a running KVM host in zone %d to delete backup %s", backup.getZoneId(), backup.getUuid())); + } DeleteBackupCommand command = new DeleteBackupCommand(backup.getExternalId(), backupRepository.getType(), backupRepository.getAddress(), backupRepository.getMountOptions()); @@ -552,7 +555,14 @@ public Pair getBackupStorageStats(Long zoneId) { @Override public void syncBackupStorageStats(Long zoneId) { final List repositories = backupRepositoryDao.listByZoneAndProvider(zoneId, getName()); + if (CollectionUtils.isEmpty(repositories)) { + return; + } final Host host = resourceManager.findOneRandomRunningHostByHypervisor(Hypervisor.HypervisorType.KVM, zoneId); + if (host == null) { + logger.warn("Unable to find a running KVM host in zone {} to sync backup storage stats", zoneId); + return; + } for (final BackupRepository repository : repositories) { GetBackupStorageStatsCommand command = new GetBackupStorageStatsCommand(repository.getType(), repository.getAddress(), repository.getMountOptions()); BackupStorageStatsAnswer answer; From 1481586ffee3409425540c06f27704da724f6182 Mon Sep 17 00:00:00 2001 From: jmsperu Date: Wed, 18 Mar 2026 22:22:04 +0300 Subject: [PATCH 2/2] Add missing CollectionUtils import after 4.22 rebase --- .../java/org/apache/cloudstack/backup/NASBackupProvider.java | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java index f4bd0911878c..076193d0b7d8 100644 --- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java +++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java @@ -63,6 +63,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; +import org.apache.commons.collections.CollectionUtils; import java.util.Comparator; import java.util.Date; import java.util.List;