VMware: Improve error messaging / logs when starting non-user VMs, and secondary storage not available or doesn't have enough capacity (apache#9207)

sureshanaparti · dhslove · commit a5c0f5dab2b4 · 2024-07-02T10:41:15.000+09:00
diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/manager/ImageStoreProviderManagerImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/manager/ImageStoreProviderManagerImpl.java
@@ -202,7 +202,7 @@ public int compare(DataStore store1, DataStore store2) {
 
         // No store with space found
         logger.error(String.format("Can't find an image storage in zone with less than %d usage",
-                Math.round(_statsCollector.getImageStoreCapacityThreshold()*100)));
+                Math.round(_statsCollector.getImageStoreCapacityThreshold() * 100)));
         return null;
     }
 
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
@@ -560,7 +560,6 @@ public List<ManagedObjectReference> addHostToPodCluster(VmwareContext serviceCon
 
     @Override
     public Pair<String, Long> getSecondaryStorageStoreUrlAndId(long dcId) {
-
         String secUrl = null;
         Long secId = null;
         DataStore secStore = _dataStoreMgr.getImageStoreWithFreeCapacity(dcId);
@@ -570,18 +569,17 @@ public Pair<String, Long> getSecondaryStorageStoreUrlAndId(long dcId) {
         }
 
         if (secUrl == null) {
-            // we are using non-NFS image store, then use cache storage instead
-            logger.info("Secondary storage is not NFS, we need to use staging storage");
+            logger.info("Secondary storage is either not having free capacity or not NFS, then use cache/staging storage instead");
             DataStore cacheStore = _dataStoreMgr.getImageCacheStore(dcId);
             if (cacheStore != null) {
                 secUrl = cacheStore.getUri();
                 secId = cacheStore.getId();
             } else {
-                logger.warn("No staging storage is found when non-NFS secondary storage is used");
+                logger.warn("No cache/staging storage found when NFS secondary storage with free capacity not available or non-NFS secondary storage is used");
             }
         }
 
-        return new Pair<String, Long>(secUrl, secId);
+        return new Pair<>(secUrl, secId);
     }
 
     @Override
@@ -597,13 +595,12 @@ public List<Pair<String, Long>> getSecondaryStorageStoresUrlAndIdList(long dcId)
         }
 
         if (urlIdList.isEmpty()) {
-            // we are using non-NFS image store, then use cache storage instead
-            logger.info("Secondary storage is not NFS, we need to use staging storage");
+            logger.info("Secondary storage is either not having free capacity or not NFS, then use cache/staging storage instead");
             DataStore cacheStore = _dataStoreMgr.getImageCacheStore(dcId);
             if (cacheStore != null) {
                 urlIdList.add(new Pair<>(cacheStore.getUri(), cacheStore.getId()));
             } else {
-                logger.warn("No staging storage is found when non-NFS secondary storage is used");
+                logger.warn("No cache/staging storage found when NFS secondary storage with free capacity not available or non-NFS secondary storage is used");
             }
         }
 
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -48,6 +48,7 @@
 import javax.naming.ConfigurationException;
 import javax.xml.datatype.XMLGregorianCalendar;
 
+import com.cloud.capacity.CapacityManager;
 import com.cloud.hypervisor.vmware.mo.HostDatastoreBrowserMO;
 import com.vmware.vim25.FileInfo;
 import com.vmware.vim25.FileQueryFlags;
@@ -2277,15 +2278,15 @@ protected StartAnswer execute(StartCommand cmd) {
                 // attach ISO (for patching of system VM)
                 Pair<String, Long> secStoreUrlAndId = mgr.getSecondaryStorageStoreUrlAndId(Long.parseLong(_dcId));
                 String secStoreUrl = secStoreUrlAndId.first();
-                Long secStoreId = secStoreUrlAndId.second();
                 if (secStoreUrl == null) {
-                    String msg = "secondary storage for dc " + _dcId + " is not ready yet?";
+                    String msg = String.format("NFS secondary or cache storage of dc %s either doesn't have enough capacity (has reached %d%% usage threshold) or not ready yet, or non-NFS secondary storage is used",
+                            _dcId, Math.round(CapacityManager.SecondaryStorageCapacityThreshold.value() * 100));
                     throw new Exception(msg);
                 }
 
                 ManagedObjectReference morSecDs = prepareSecondaryDatastoreOnHost(secStoreUrl);
                 if (morSecDs == null) {
-                    String msg = "Failed to prepare secondary storage on host, secondary store url: " + secStoreUrl;
+                    String msg = "Failed to prepare secondary storage on host, NFS secondary or cache store url: " + secStoreUrl + " in dc "+ _dcId;
                     throw new Exception(msg);
                 }
                 DatastoreMO secDsMo = new DatastoreMO(hyperHost.getContext(), morSecDs);
@@ -4613,15 +4614,15 @@ protected Answer execute(PrepareForMigrationCommand cmd) {
             List<Pair<String, Long>> secStoreUrlAndIdList = mgr.getSecondaryStorageStoresUrlAndIdList(Long.parseLong(_dcId));
             for (Pair<String, Long> secStoreUrlAndId : secStoreUrlAndIdList) {
                 String secStoreUrl = secStoreUrlAndId.first();
-                Long secStoreId = secStoreUrlAndId.second();
                 if (secStoreUrl == null) {
-                    String msg = String.format("Secondary storage for dc %s is not ready yet?", _dcId);
+                    String msg = String.format("NFS secondary or cache storage of dc %s either doesn't have enough capacity (has reached %d%% usage threshold) or not ready yet, or non-NFS secondary storage is used",
+                            _dcId, Math.round(CapacityManager.SecondaryStorageCapacityThreshold.value() * 100));
                     throw new Exception(msg);
                 }
 
                 ManagedObjectReference morSecDs = prepareSecondaryDatastoreOnHost(secStoreUrl);
                 if (morSecDs == null) {
-                    String msg = "Failed to prepare secondary storage on host, secondary store url: " + secStoreUrl;
+                    String msg = "Failed to prepare secondary storage on host, NFS secondary or cache store url: " + secStoreUrl + " in dc "+ _dcId;
                     throw new Exception(msg);
                 }
             }
@@ -7343,14 +7344,14 @@ private List<VolumeObjectTO> relocateVirtualMachine(final VmwareHypervisorHost h
                 VmwareManager mgr = targetHyperHost.getContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
                 Pair<String, Long> secStoreUrlAndId = mgr.getSecondaryStorageStoreUrlAndId(Long.parseLong(_dcId));
                 String secStoreUrl = secStoreUrlAndId.first();
-                Long secStoreId = secStoreUrlAndId.second();
                 if (secStoreUrl == null) {
-                    String msg = "secondary storage for dc " + _dcId + " is not ready yet?";
+                    String msg = String.format("NFS secondary or cache storage of dc %s either doesn't have enough capacity (has reached %d%% usage threshold) or not ready yet, or non-NFS secondary storage is used",
+                            _dcId, Math.round(CapacityManager.SecondaryStorageCapacityThreshold.value() * 100));
                     throw new Exception(msg);
                 }
                 ManagedObjectReference morSecDs = prepareSecondaryDatastoreOnSpecificHost(secStoreUrl, targetHyperHost);
                 if (morSecDs == null) {
-                    throw new Exception(String.format("Failed to prepare secondary storage on host, secondary store url: %s", secStoreUrl));
+                    throw new Exception(String.format("Failed to prepare secondary storage on host, NFS secondary or cache store url: %s in dc %s", secStoreUrl, _dcId));
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ public int compare(DataStore store1, DataStore store2) {`
`202`	`202`
`203`	`203`	`// No store with space found`
`204`	`204`	`logger.error(String.format("Can't find an image storage in zone with less than %d usage",`
`205`		`- Math.round(_statsCollector.getImageStoreCapacityThreshold()*100)));`
	`205`	`+ Math.round(_statsCollector.getImageStoreCapacityThreshold() * 100)));`
`206`	`206`	`return null;`
`207`	`207`	`}`
`208`	`208`
Original file line number	Diff line number	Diff line change
`@@ -560,7 +560,6 @@ public List<ManagedObjectReference> addHostToPodCluster(VmwareContext serviceCon`
`560`	`560`
`561`	`561`	`@Override`
`562`	`562`	`public Pair<String, Long> getSecondaryStorageStoreUrlAndId(long dcId) {`
`563`		`-`
`564`	`563`	`String secUrl = null;`
`565`	`564`	`Long secId = null;`
`566`	`565`	`DataStore secStore = _dataStoreMgr.getImageStoreWithFreeCapacity(dcId);`
`@@ -570,18 +569,17 @@ public Pair<String, Long> getSecondaryStorageStoreUrlAndId(long dcId) {`
`570`	`569`	`}`
`571`	`570`
`572`	`571`	`if (secUrl == null) {`
`573`		`- // we are using non-NFS image store, then use cache storage instead`
`574`		`- logger.info("Secondary storage is not NFS, we need to use staging storage");`
	`572`	`+ logger.info("Secondary storage is either not having free capacity or not NFS, then use cache/staging storage instead");`
`575`	`573`	`DataStore cacheStore = _dataStoreMgr.getImageCacheStore(dcId);`
`576`	`574`	`if (cacheStore != null) {`
`577`	`575`	`secUrl = cacheStore.getUri();`
`578`	`576`	`secId = cacheStore.getId();`
`579`	`577`	`} else {`
`580`		`- logger.warn("No staging storage is found when non-NFS secondary storage is used");`
	`578`	`+ logger.warn("No cache/staging storage found when NFS secondary storage with free capacity not available or non-NFS secondary storage is used");`
`581`	`579`	`}`
`582`	`580`	`}`
`583`	`581`
`584`		`- return new Pair<String, Long>(secUrl, secId);`
	`582`	`+ return new Pair<>(secUrl, secId);`
`585`	`583`	`}`
`586`	`584`
`587`	`585`	`@Override`
`@@ -597,13 +595,12 @@ public List<Pair<String, Long>> getSecondaryStorageStoresUrlAndIdList(long dcId)`
`597`	`595`	`}`
`598`	`596`
`599`	`597`	`if (urlIdList.isEmpty()) {`
`600`		`- // we are using non-NFS image store, then use cache storage instead`
`601`		`- logger.info("Secondary storage is not NFS, we need to use staging storage");`
	`598`	`+ logger.info("Secondary storage is either not having free capacity or not NFS, then use cache/staging storage instead");`
`602`	`599`	`DataStore cacheStore = _dataStoreMgr.getImageCacheStore(dcId);`
`603`	`600`	`if (cacheStore != null) {`
`604`	`601`	`urlIdList.add(new Pair<>(cacheStore.getUri(), cacheStore.getId()));`
`605`	`602`	`} else {`
`606`		`- logger.warn("No staging storage is found when non-NFS secondary storage is used");`
	`603`	`+ logger.warn("No cache/staging storage found when NFS secondary storage with free capacity not available or non-NFS secondary storage is used");`
`607`	`604`	`}`
`608`	`605`	`}`
`609`	`606`