[cloudstack] branch 4.18 updated: vmware: do not create vm datastore when attach an existing volume on solidfire (#7160)

[weizhou]

This is an automated email from the ASF dual-hosted git repository.

weizhou pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.18 by this push:
     new b2e9993b0ac vmware: do not create vm datastore when attach an existing 
volume on solidfire (#7160)
b2e9993b0ac is described below

commit b2e9993b0acf94d57113837951401170d692eaff
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Thu Jun 1 14:26:57 2023 +0200

    vmware: do not create vm datastore when attach an existing volume on 
solidfire (#7160)
---
 .../main/java/com/cloud/storage/resource/VmwareStorageProcessor.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
 
b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
index 444008f167e..7b4d5f118b4 100644
--- 
a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ 
b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -2823,7 +2823,10 @@ public class VmwareStorageProcessor implements 
StorageProcessor {
             throw new Exception("A relevant SCSI disk could not be located to 
use to create a datastore.");
         }
 
-        morDs = firstHostDatastoreSystemMO.createVmfsDatastore(datastoreName, 
hostScsiDisk);
+        morDs = firstHostDatastoreSystemMO.findDatastoreByName(datastoreName);
+        if (morDs == null) {
+            morDs = 
firstHostDatastoreSystemMO.createVmfsDatastore(datastoreName, hostScsiDisk);
+        }
 
         if (morDs != null) {
             waitForAllHostsToMountDatastore(lstHosts, new DatastoreMO(context, 
morDs));