From c5422ae2b613c37a43c39730fde6d4f9537d874c Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 2 Nov 2026 15:29:47 +0100 Subject: [PATCH] storage: remove never-used parameters Part of #12316 Co-Authored-By: Claude Opus 5.5 --- .../java/com/cloud/storage/StorageManager.java | 8 ++------ .../GarbageCollectingStoragePoolAllocator.java | 2 +- .../com/cloud/storage/StorageManagerImpl.java | 18 ++++-------------- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/engine/components-api/src/main/java/com/cloud/storage/StorageManager.java b/engine/components-api/src/main/java/com/cloud/storage/StorageManager.java index b7a9ef0e9916..f9106b9d7185 100644 --- a/engine/components-api/src/main/java/com/cloud/storage/StorageManager.java +++ b/engine/components-api/src/main/java/com/cloud/storage/StorageManager.java @@ -280,11 +280,8 @@ static Boolean getFullCloneConfiguration(Long storeId) { */ List getStoragePoolTagList(long poolId); - Answer sendToPool(long poolId, Command cmd) throws StorageUnavailableException; - Answer sendToPool(StoragePool pool, Command cmd) throws StorageUnavailableException; - Answer[] sendToPool(long poolId, Commands cmd) throws StorageUnavailableException; Answer[] sendToPool(StoragePool pool, Commands cmds) throws StorageUnavailableException; @@ -304,9 +301,8 @@ static Boolean getFullCloneConfiguration(Long storeId) { /** * Cleans up storage pools by removing unused templates. - * @param recurring - true if this cleanup is part of a recurring garbage collection thread */ - void cleanupStorage(boolean recurring); + void cleanupStorage(); void createCapacityEntry(StoragePoolVO storagePool, short capacityType, long allocated); @@ -340,7 +336,7 @@ static Boolean getFullCloneConfiguration(Long storeId) { List getUpHostsInPool(long poolId); - void cleanupSecondaryStorage(boolean recurring); + void cleanupSecondaryStorage(); HypervisorType getHypervisorTypeFromFormat(ImageFormat format); diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java index 39c29bd2c6e6..f0780eccf59e 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java @@ -53,7 +53,7 @@ public List select(DiskProfile dskCh, VirtualMachineProfile vmProfi } // Clean up all storage pools - storageMgr.cleanupStorage(false); + storageMgr.cleanupStorage(); // Determine what allocator to use StoragePoolAllocator allocator; if (dskCh.useLocalStorage()) { diff --git a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java index 28742f949f86..3b8d4ed98b2f 100644 --- a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java @@ -1946,7 +1946,7 @@ private void cleanupInactiveTemplates() { } @Override - public void cleanupStorage(boolean recurring) { + public void cleanupStorage() { GlobalLock scanLock = GlobalLock.getInternLock("storagemgr.cleanup"); try { @@ -1987,7 +1987,7 @@ public void cleanupStorage(boolean recurring) { } cleanupSnapshotsFromStoreRefInDestroyingState(); - cleanupSecondaryStorage(recurring); + cleanupSecondaryStorage(); List vols = volumeDao.listVolumesToBeDestroyed(new Date(System.currentTimeMillis() - ((long)StorageCleanupDelay.value() << 10))); List rootVolumeVmIds = vols.stream() @@ -2269,7 +2269,7 @@ private void handleManagedStorage(Volume volume) { @Override @DB - public void cleanupSecondaryStorage(boolean recurring) { + public void cleanupSecondaryStorage() { // NOTE that object_store refactor will immediately delete the object from secondary storage when deleteTemplate etc api is issued. // so here we don't need to issue DeleteCommand to resource anymore, only need to remove db entry. try { @@ -2944,7 +2944,7 @@ protected void runInContext() { try { logger.trace("Storage Garbage Collection Thread is running."); - cleanupStorage(true); + cleanupStorage(); } catch (Exception e) { logger.error("Caught the following Exception", e); @@ -3702,16 +3702,6 @@ public synchronized boolean registerHostListener(String providerName, Hypervisor return true; } - @Override - public Answer sendToPool(long poolId, Command cmd) throws StorageUnavailableException { - return null; - } - - @Override - public Answer[] sendToPool(long poolId, Commands cmd) throws StorageUnavailableException { - return null; - } - @Override public String getName() { return null;