You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by "nvazquez (via GitHub)" <gi...@apache.org> on 2025/06/22 05:23:59 UTC
[PR] Support Direct Download on Ceph primary storage [cloudstack]
nvazquez opened a new pull request, #11069:
URL: https://github.com/apache/cloudstack/pull/11069
### Description
This PR adds support for Direct Downloads on Ceph primary storage. Its logic is replicating the logic added on the Storpool support for Direct download #9833 but adapted to Ceph. As the approach uses `qemu-img convert` it is required that KVM hosts have the `ceph.conf` on them.
Fixes: #3065
<!--- ******************************************************************************* -->
<!--- NOTE: AUTOMATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE DOCUMENTATION. -->
<!--- PLEASE PUT AN 'X' in only **ONE** box -->
<!--- ******************************************************************************* -->
### Types of changes
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Bug fix (non-breaking change which fixes an issue)
- [x] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
- [ ] build/CI
- [ ] test (unit or integration test code)
### Feature/Enhancement Scale or Bug Severity
#### Feature/Enhancement Scale
- [ ] Major
- [ ] Minor
#### Bug Severity
- [ ] BLOCKER
- [ ] Critical
- [ ] Major
- [ ] Minor
- [ ] Trivial
### Screenshots (if appropriate):
### How Has This Been Tested?
Tested on KVM env with NFS and Ceph primary pool
Created a service offering containing a storage tag matching the Ceph pool
Registered template using 'Direct download' option
Deploy VM -> Observe the VM is deployed and booted, disk downloaded to temporary location and converted to the Ceph destination
#### How did you try to break this feature and the system with this change?
<!-- see how your change affects other areas of the code, etc. -->
<!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md) document -->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support Direct Download on Ceph primary storage [cloudstack]
Posted by "nvazquez (via GitHub)" <gi...@apache.org>.
nvazquez commented on PR #11069:
URL: https://github.com/apache/cloudstack/pull/11069#issuecomment-2993947358
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support Direct Download on Ceph primary storage [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #11069:
URL: https://github.com/apache/cloudstack/pull/11069#issuecomment-2993972165
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 13869
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support Direct Download on Ceph primary storage [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland merged PR #11069:
URL: https://github.com/apache/cloudstack/pull/11069
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support Direct Download on Ceph primary storage [cloudstack]
Posted by "nvazquez (via GitHub)" <gi...@apache.org>.
nvazquez commented on PR #11069:
URL: https://github.com/apache/cloudstack/pull/11069#issuecomment-2996402070
@wido I have recreated my CloudStack environment from the latest packages without copying the ceph.conf files to the KVM hosts. Now I'm not hitting any issue on the qemu-img convertion and direct download templates are successfully deployed. I have updated the PR description to remove the need of ceph.conf file.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support Direct Download on Ceph primary storage [cloudstack]
Posted by "wido (via GitHub)" <gi...@apache.org>.
wido commented on code in PR #11069:
URL: https://github.com/apache/cloudstack/pull/11069#discussion_r2161368784
##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java:
##########
@@ -224,10 +224,35 @@ public KVMPhysicalDisk createTemplateFromDirectDownloadFile(String templateFileP
} else {
Script.runSimpleBashScript("mv " + templateFilePath + " " + destinationFile);
}
+ } else if (destPool.getType() == StoragePoolType.RBD) {
+ String temporaryExtractFilePath = sourceFile.getParent() + File.separator + templateUuid;
+ extractDownloadedTemplate(templateFilePath, destPool, temporaryExtractFilePath);
+ createTemplateOnRBDFromDirectDownloadFile(temporaryExtractFilePath, templateUuid, destPool, timeout);
}
return destPool.getPhysicalDisk(templateUuid);
}
+ private void createTemplateOnRBDFromDirectDownloadFile(String srcTemplateFilePath, String templateUuid, KVMStoragePool destPool, int timeout) {
+ try {
+ QemuImg.PhysicalDiskFormat srcFileFormat = QemuImg.PhysicalDiskFormat.QCOW2;
+ QemuImgFile srcFile = new QemuImgFile(srcTemplateFilePath, srcFileFormat);
+ QemuImg qemu = new QemuImg(timeout);
+ Map<String, String> info = qemu.info(srcFile);
+ Long virtualSize = Long.parseLong(info.get(QemuImg.VIRTUAL_SIZE));
+ KVMPhysicalDisk destDisk = new KVMPhysicalDisk(destPool.getSourceDir() + "/" + templateUuid, templateUuid, destPool);
+ destDisk.setFormat(PhysicalDiskFormat.RAW);
+ destDisk.setSize(virtualSize);
+ destDisk.setVirtualSize(virtualSize);
+ QemuImgFile destFile = new QemuImgFile(KVMPhysicalDisk.RBDStringBuilder(destPool, destDisk.getPath()));
Review Comment:
This line here makes that it doesn't ceph.conf, right?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support Direct Download on Ceph primary storage [cloudstack]
Posted by "codecov[bot] (via GitHub)" <gi...@apache.org>.
codecov[bot] commented on PR #11069:
URL: https://github.com/apache/cloudstack/pull/11069#issuecomment-2993948762
## [Codecov](https://app.codecov.io/gh/apache/cloudstack/pull/11069?dropdown=coverage&src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) Report
All modified and coverable lines are covered by tests :white_check_mark:
> Project coverage is 3.90%. Comparing base [(`5b7c3b4`)](https://app.codecov.io/gh/apache/cloudstack/commit/5b7c3b475e39eed3872a9f8f9dc8cb68ddd21302?dropdown=coverage&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) to head [(`8e199ca`)](https://app.codecov.io/gh/apache/cloudstack/commit/8e199cae1cc7d654be6cc0784882e1c5f37e2134?dropdown=coverage&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache).
> :exclamation: There is a different number of reports uploaded between BASE (5b7c3b4) and HEAD (8e199ca). Click for more details.
>
> <details><summary>HEAD has 1 upload less than BASE</summary>
>
>| Flag | BASE (5b7c3b4) | HEAD (8e199ca) |
>|------|------|------|
>|unittests|1|0|
></details>
<details><summary>Additional details and impacted files</summary>
```diff
@@ Coverage Diff @@
## main #11069 +/- ##
=============================================
- Coverage 16.57% 3.90% -12.68%
=============================================
Files 5743 414 -5329
Lines 510468 33744 -476724
Branches 62073 6074 -55999
=============================================
- Hits 84616 1317 -83299
+ Misses 416390 32271 -384119
+ Partials 9462 156 -9306
```
| [Flag](https://app.codecov.io/gh/apache/cloudstack/pull/11069/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | Coverage Δ | |
|---|---|---|
| [uitests](https://app.codecov.io/gh/apache/cloudstack/pull/11069/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | `3.90% <ø> (ø)` | |
| [unittests](https://app.codecov.io/gh/apache/cloudstack/pull/11069/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | `?` | |
Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache#carryforward-flags-in-the-pull-request-comment) to find out more.
</details>
[:umbrella: View full report in Codecov by Sentry](https://app.codecov.io/gh/apache/cloudstack/pull/11069?dropdown=coverage&src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache).
:loudspeaker: Have feedback on the report? [Share it here](https://about.codecov.io/codecov-pr-comment-feedback/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache).
<details><summary> :rocket: New features to boost your workflow: </summary>
- :snowflake: [Test Analytics](https://docs.codecov.com/docs/test-analytics): Detect flaky tests, report on failures, and find test suite problems.
- :package: [JS Bundle Analysis](https://docs.codecov.com/docs/javascript-bundle-analysis): Save yourself from yourself by tracking and limiting bundle sizes in JS merges.
</details>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support Direct Download on Ceph primary storage [cloudstack]
Posted by "nvazquez (via GitHub)" <gi...@apache.org>.
nvazquez commented on code in PR #11069:
URL: https://github.com/apache/cloudstack/pull/11069#discussion_r2161437030
##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java:
##########
@@ -224,10 +224,35 @@ public KVMPhysicalDisk createTemplateFromDirectDownloadFile(String templateFileP
} else {
Script.runSimpleBashScript("mv " + templateFilePath + " " + destinationFile);
}
+ } else if (destPool.getType() == StoragePoolType.RBD) {
+ String temporaryExtractFilePath = sourceFile.getParent() + File.separator + templateUuid;
+ extractDownloadedTemplate(templateFilePath, destPool, temporaryExtractFilePath);
+ createTemplateOnRBDFromDirectDownloadFile(temporaryExtractFilePath, templateUuid, destPool, timeout);
}
return destPool.getPhysicalDisk(templateUuid);
}
+ private void createTemplateOnRBDFromDirectDownloadFile(String srcTemplateFilePath, String templateUuid, KVMStoragePool destPool, int timeout) {
+ try {
+ QemuImg.PhysicalDiskFormat srcFileFormat = QemuImg.PhysicalDiskFormat.QCOW2;
+ QemuImgFile srcFile = new QemuImgFile(srcTemplateFilePath, srcFileFormat);
+ QemuImg qemu = new QemuImg(timeout);
+ Map<String, String> info = qemu.info(srcFile);
+ Long virtualSize = Long.parseLong(info.get(QemuImg.VIRTUAL_SIZE));
+ KVMPhysicalDisk destDisk = new KVMPhysicalDisk(destPool.getSourceDir() + "/" + templateUuid, templateUuid, destPool);
+ destDisk.setFormat(PhysicalDiskFormat.RAW);
+ destDisk.setSize(virtualSize);
+ destDisk.setVirtualSize(virtualSize);
+ QemuImgFile destFile = new QemuImgFile(KVMPhysicalDisk.RBDStringBuilder(destPool, destDisk.getPath()));
Review Comment:
In my case the logs indicated that qemu img was looking for ceph.conf at diferent directories and failed as it couldn't find it. Probably it could be some misconfiguration at my side, will explore
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support Direct Download on Ceph primary storage [cloudstack]
Posted by "nvazquez (via GitHub)" <gi...@apache.org>.
nvazquez commented on PR #11069:
URL: https://github.com/apache/cloudstack/pull/11069#issuecomment-2996135907
Thanks @wido - sorry I was not aware of this, I added the `ceph.conf` file as my `qemu-img` command execution was complaining about the file not found, then I added it. Probably it could be a misconfiguration on my cluster, I will investigate and try passing options to the qemu-img command as you suggested
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support Direct Download on Ceph primary storage [cloudstack]
Posted by "wido (via GitHub)" <gi...@apache.org>.
wido commented on code in PR #11069:
URL: https://github.com/apache/cloudstack/pull/11069#discussion_r2161368784
##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java:
##########
@@ -224,10 +224,35 @@ public KVMPhysicalDisk createTemplateFromDirectDownloadFile(String templateFileP
} else {
Script.runSimpleBashScript("mv " + templateFilePath + " " + destinationFile);
}
+ } else if (destPool.getType() == StoragePoolType.RBD) {
+ String temporaryExtractFilePath = sourceFile.getParent() + File.separator + templateUuid;
+ extractDownloadedTemplate(templateFilePath, destPool, temporaryExtractFilePath);
+ createTemplateOnRBDFromDirectDownloadFile(temporaryExtractFilePath, templateUuid, destPool, timeout);
}
return destPool.getPhysicalDisk(templateUuid);
}
+ private void createTemplateOnRBDFromDirectDownloadFile(String srcTemplateFilePath, String templateUuid, KVMStoragePool destPool, int timeout) {
+ try {
+ QemuImg.PhysicalDiskFormat srcFileFormat = QemuImg.PhysicalDiskFormat.QCOW2;
+ QemuImgFile srcFile = new QemuImgFile(srcTemplateFilePath, srcFileFormat);
+ QemuImg qemu = new QemuImg(timeout);
+ Map<String, String> info = qemu.info(srcFile);
+ Long virtualSize = Long.parseLong(info.get(QemuImg.VIRTUAL_SIZE));
+ KVMPhysicalDisk destDisk = new KVMPhysicalDisk(destPool.getSourceDir() + "/" + templateUuid, templateUuid, destPool);
+ destDisk.setFormat(PhysicalDiskFormat.RAW);
+ destDisk.setSize(virtualSize);
+ destDisk.setVirtualSize(virtualSize);
+ QemuImgFile destFile = new QemuImgFile(KVMPhysicalDisk.RBDStringBuilder(destPool, destDisk.getPath()));
Review Comment:
This line here makes that it doesn't need ceph.conf, right?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support Direct Download on Ceph primary storage [cloudstack]
Posted by "wido (via GitHub)" <gi...@apache.org>.
wido commented on PR #11069:
URL: https://github.com/apache/cloudstack/pull/11069#issuecomment-2996035503
Great work! Good to see progress here. But requiring ceph.conf on the node will break a lot of things. As CloudStack supports multiple Ceph RBD pools, how will we handle this? We can't guarantee that there will be only one Ceph cluster.
Why don't we pass these arguments to qemu-img?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support Direct Download on Ceph primary storage [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #11069:
URL: https://github.com/apache/cloudstack/pull/11069#issuecomment-2993947706
@nvazquez a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support Direct Download on Ceph primary storage [cloudstack]
Posted by "nvazquez (via GitHub)" <gi...@apache.org>.
nvazquez commented on code in PR #11069:
URL: https://github.com/apache/cloudstack/pull/11069#discussion_r2161576254
##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java:
##########
@@ -224,10 +224,35 @@ public KVMPhysicalDisk createTemplateFromDirectDownloadFile(String templateFileP
} else {
Script.runSimpleBashScript("mv " + templateFilePath + " " + destinationFile);
}
+ } else if (destPool.getType() == StoragePoolType.RBD) {
+ String temporaryExtractFilePath = sourceFile.getParent() + File.separator + templateUuid;
+ extractDownloadedTemplate(templateFilePath, destPool, temporaryExtractFilePath);
+ createTemplateOnRBDFromDirectDownloadFile(temporaryExtractFilePath, templateUuid, destPool, timeout);
}
return destPool.getPhysicalDisk(templateUuid);
}
+ private void createTemplateOnRBDFromDirectDownloadFile(String srcTemplateFilePath, String templateUuid, KVMStoragePool destPool, int timeout) {
+ try {
+ QemuImg.PhysicalDiskFormat srcFileFormat = QemuImg.PhysicalDiskFormat.QCOW2;
+ QemuImgFile srcFile = new QemuImgFile(srcTemplateFilePath, srcFileFormat);
+ QemuImg qemu = new QemuImg(timeout);
+ Map<String, String> info = qemu.info(srcFile);
+ Long virtualSize = Long.parseLong(info.get(QemuImg.VIRTUAL_SIZE));
+ KVMPhysicalDisk destDisk = new KVMPhysicalDisk(destPool.getSourceDir() + "/" + templateUuid, templateUuid, destPool);
+ destDisk.setFormat(PhysicalDiskFormat.RAW);
+ destDisk.setSize(virtualSize);
+ destDisk.setVirtualSize(virtualSize);
+ QemuImgFile destFile = new QemuImgFile(KVMPhysicalDisk.RBDStringBuilder(destPool, destDisk.getPath()));
Review Comment:
I was initially testing on 4.20 branch and the RBDStringBuilder was accepting more parameters, I have now recreated the env using this PR packages and I don't observe the failure anymore
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org