Skip to content

Enable creation of vms with solidfire root volumes on vmware67 #4977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
skattoju4 wants to merge 3 commits into from
Closed

Enable creation of vms with solidfire root volumes on vmware67 #4977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65fe8c4
draft fix to enable creation of vms with solidfire root volumes on vm…
skattoju4 Apr 30, 2021
c0e7376
create fcd folder to maintain compatibility
skattoju4 Apr 30, 2021
a6e9386
Update vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/Datas…
pdion891 May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ...n/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,10 +1390,12 @@ else if (volumeInfo.getFormat() == ImageFormat.OVA) {

verifyCopyCmdAnswer(copyCmdAnswer, templateInfo);

// Seems like vmware 6.5 and above does not automatically remount the datastore after rescanning the storage.
// Not sure if this is needed.
// If using VMware, have the host rescan its software HBA if dynamic discovery is in use.
if (HypervisorType.VMware.equals(templateInfo.getHypervisorType())) {
Copy link
Copy Markdown
Member

@yadvr yadvr May 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @harikrishna-patnala @nvazquez could this cause any regression?

Copy link
Copy Markdown
Member

@harikrishna-patnala harikrishna-patnala May 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@skattoju4 There are two more methods in which disconnectHostFromVolume() method is being called. Any specific reason why you want to remove this method call only here. Can you check the other two methods as well handleCreateManagedVolumeFromManagedSnapshot() and handleCopyAsyncToSecondaryStorage(). These two are also related to managed storage.

disconnectHostFromVolume(hostVO, volumeInfo.getPoolId(), volumeInfo.get_iScsiName());
}
//if (HypervisorType.VMware.equals(templateInfo.getHypervisorType())) {
// disconnectHostFromVolume(hostVO, volumeInfo.getPoolId(), volumeInfo.get_iScsiName());
//}
Comment on lines +1396 to +1398
Copy link
Copy Markdown
Contributor

@GutoVeronezi GutoVeronezi May 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As git will keep the history, we can remove the code and move the comment from code to commit message.

Copy link
Copy Markdown
Contributor

@sureshanaparti sureshanaparti May 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

}
else {
VolumeObjectTO newVolume = new VolumeObjectTO();
Expand Down
7 changes: 6 additions & 1 deletion ...ypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageLayoutHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,17 @@ public static String syncVolumeToVmDefaultFolder(DatacenterMO dcMo, String vmNam
public static String syncVolumeToVmDefaultFolder(DatacenterMO dcMo, String vmName, DatastoreMO ds, String vmdkName, String excludeFolders) throws Exception {

assert (ds != null);

if (!ds.folderExists(String.format("[%s]", ds.getName()), vmName)) {
s_logger.info("VM folder does not exist on target datastore, we will create one. vm: " + vmName + ", datastore: " + ds.getName());

ds.makeDirectory(String.format("[%s] %s", ds.getName(), vmName), dcMo.getMor());
}

if (!ds.folderExists(String.format("[%s]", ds.getName()), "fcd")) {
Copy link
Copy Markdown
Contributor

@sureshanaparti sureshanaparti May 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use the constant "HypervisorHostHelper.VSPHERE_DATASTORE_BASE_FOLDER" for "fcd"

Copy link
Copy Markdown
Contributor

@sureshanaparti sureshanaparti May 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use the constant "HypervisorHostHelper.VSPHERE_DATASTORE_BASE_FOLDER" for "fcd"

@skattoju4 any update on the changes suggested.

Copy link
Copy Markdown
Contributor Author

@skattoju4 skattoju4 May 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for the delay.. will update later this evening.

s_logger.info("fcd folder does not exist on target datastore, we will create one. vm: " + vmName + ", datastore: " + ds.getName());
ds.makeDirectory(String.format("[%s] %s", ds.getName(), "fcd"), dcMo.getMor());
Copy link
Copy Markdown
Contributor

@sureshanaparti sureshanaparti May 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"fcd" => HypervisorHostHelper.VSPHERE_DATASTORE_BASE_FOLDER

}

String[] vmdkLinkedCloneModeLegacyPair = getVmdkFilePairDatastorePath(ds, vmName, vmdkName, VmwareStorageLayoutType.CLOUDSTACK_LEGACY, true);
String[] vmdkFullCloneModeLegacyPair = getVmdkFilePairDatastorePath(ds, vmName, vmdkName, VmwareStorageLayoutType.CLOUDSTACK_LEGACY, false);

Expand Down
3 changes: 2 additions & 1 deletion ...s/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,8 @@ public ResignatureAnswer resignature(ResignatureCommand cmd) {
}
}

removeVmfsDatastore(cmd, hyperHost, datastoreName, storageHost, storagePortNumber, trimIqn(iScsiName), lstHosts);
//vmware 6.7 does not automatically mount datastores after rescanning once removed
//removeVmfsDatastore(cmd, hyperHost, datastoreName, storageHost, storagePortNumber, trimIqn(iScsiName), lstHosts);
Comment on lines +283 to +284
Copy link
Copy Markdown
Contributor

@GutoVeronezi GutoVeronezi May 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As git will keep the history, we can remove the code and move the comment from code to commit message.


if (!foundExtent) {
throw new CloudRuntimeException("Unable to locate the applicable extent");
Expand Down
26 changes: 15 additions & 11 deletions vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,16 +309,20 @@ public String[] listDirContent(String path) throws Exception {
public boolean fileExists(String fileFullPath) throws Exception {
DatastoreFile file = new DatastoreFile(fileFullPath);
DatastoreFile dirFile = new DatastoreFile(file.getDatastoreName(), file.getDir());

HostDatastoreBrowserMO browserMo = getHostDatastoreBrowserMO();

s_logger.info("Search file " + file.getFileName() + " on " + dirFile.getPath());
HostDatastoreBrowserSearchResults results = browserMo.searchDatastore(dirFile.getPath(), file.getFileName(), true);
if (results != null) {
List<FileInfo> info = results.getFile();
if (info != null && info.size() > 0) {
s_logger.info("File " + fileFullPath + " exists on datastore");
return true;
Boolean folderExists = true;
if(file.getDir() != ""){
Copy link
Copy Markdown
Contributor

@GutoVeronezi GutoVeronezi May 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

import org.apache.commons.lang3.StringUtils;
        if (StringUtils.isNotEmpty(file.getDir())){

folderExists = folderExists(String.format("[%s]", file.getDatastoreName()), file.getDir());
}
if (folderExists){
HostDatastoreBrowserMO browserMo = getHostDatastoreBrowserMO();
s_logger.info("Search file " + file.getFileName() + " on " + dirFile.getPath());
HostDatastoreBrowserSearchResults results = browserMo.searchDatastore(dirFile.getPath(), file.getFileName(), true);
if (results != null) {
List<FileInfo> info = results.getFile();
if (info != null && info.size() > 0) {
Copy link
Copy Markdown
Contributor

@GutoVeronezi GutoVeronezi May 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

import org.apache.commons.collections.CollectionUtils;
            if (CollectionUtils.isNotEmpty(info)) {

s_logger.info("File " + fileFullPath + " exists on datastore");
return true;
}
}
}

Expand Down Expand Up @@ -359,7 +363,7 @@ public long fileDiskSize(String fileFullPath) throws Exception {

public boolean folderExists(String folderParentDatastorePath, String folderName) throws Exception {
HostDatastoreBrowserMO browserMo = getHostDatastoreBrowserMO();

s_logger.info("Search folder " + folderName + " on " + folderParentDatastorePath);
HostDatastoreBrowserSearchResults results = browserMo.searchDatastore(folderParentDatastorePath, folderName, true);
if (results != null) {
List<FileInfo> info = results.getFile();
Expand Down