Merge branch 'fix/ZSTAC-79628' into '5.5.12'

<fix>[storage]: honor force flag to clean image cache for existing images with no VMs (ZSTAC-79628)

See merge request zstackio/zstack!9252

Author: gitlab

plugin/ceph/src/main/java/org/zstack/storage/ceph/primary/CephImageCacheCleaner.java

@@ -34,7 +34,7 @@ protected GlobalConfig cleanupIntervalConfig() {
     @Transactional
     @Override
     protected List<ImageCacheShadowVO> createShadowImageCacheVOsForNewDeletedAndOld(String psUuid, ImageCacheCleanParam param) {
-        List<Long> staleImageCacheIds = getStaleImageCacheIds(psUuid, false);
+        List<Long> staleImageCacheIds = getStaleImageCacheIds(psUuid, param.includeReadyImage);
         if (staleImageCacheIds == null || staleImageCacheIds.isEmpty()) {
             return null;
         }

storage/src/main/java/org/zstack/storage/primary/ImageCacheCleaner.java

@@ -387,8 +387,8 @@ private List<Long> queryCacheOfExpungedImage(String psUuid) {
 
     @Transactional
     protected List<ImageCacheShadowVO> createShadowImageCacheVOsForNewDeletedAndOld(String psUuid, ImageCacheCleanParam param) {
-        // 1. image has been deleted
-        List<Long> staleImageCacheIds = getStaleImageCacheIds(psUuid, false);
+        // 1. image has been deleted or force cleanup includes images still in ready state with no VMs using them
+        List<Long> staleImageCacheIds = getStaleImageCacheIds(psUuid, param.includeReadyImage);
         if (staleImageCacheIds == null || staleImageCacheIds.isEmpty()) {
             return null;
         }