You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2022/12/02 01:24:38 UTC
[GitHub] [cloudstack] mprokopchuk opened a new pull request, #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
mprokopchuk opened a new pull request, #6939:
URL: https://github.com/apache/cloudstack/pull/6939
### Description
When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event.
Steps to reproduce:
1. Create VM
2. Check events
3. VOLUME.CREATE for the ROOT volume is not present
<!--- ********************************************************************************* -->
<!--- NOTE: AUTOMATATION 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)
- [X] Bug fix (non-breaking change which fixes an issue)
- [ ] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
### Feature/Enhancement Scale or Bug Severity
#### Feature/Enhancement Scale
- [ ] Major
- [X] Minor
#### Bug Severity
- [ ] BLOCKER
- [ ] Critical
- [ ] Major
- [X] Minor
- [ ] Trivial
### Screenshots (if appropriate):
After the fix (see highlighted VOLUME.CREATE event)
<img width="1505" alt="200795195-c1bd6b48-2f70-45e1-bcff-0d96198050cc" src="https://user-images.githubusercontent.com/742444/205193513-33184a97-5c16-4559-888e-986a25528872.png">
### How Has This Been Tested?
Tested manually.
--
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
[GitHub] [cloudstack] codecov[bot] commented on pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
codecov[bot] commented on PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#issuecomment-1334676651
# [Codecov](https://codecov.io/gh/apache/cloudstack/pull/6939?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#6939](https://codecov.io/gh/apache/cloudstack/pull/6939?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (a2e4c2f) into [main](https://codecov.io/gh/apache/cloudstack/commit/3d8ea4f3b3ee1c009871e00d20ea03087cdc18a0?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (3d8ea4f) will **increase** coverage by `0.00%`.
> The diff coverage is `0.00%`.
```diff
@@ Coverage Diff @@
## main #6939 +/- ##
=========================================
Coverage 10.87% 10.87%
+ Complexity 7118 7117 -1
=========================================
Files 2485 2485
Lines 245522 245532 +10
Branches 38335 38337 +2
=========================================
+ Hits 26701 26706 +5
- Misses 215550 215555 +5
Partials 3271 3271
```
| [Impacted Files](https://codecov.io/gh/apache/cloudstack/pull/6939?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [...n/java/com/cloud/vm/VirtualMachineManagerImpl.java](https://codecov.io/gh/apache/cloudstack/pull/6939/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZW5naW5lL29yY2hlc3RyYXRpb24vc3JjL21haW4vamF2YS9jb20vY2xvdWQvdm0vVmlydHVhbE1hY2hpbmVNYW5hZ2VySW1wbC5qYXZh) | `0.00% <0.00%> (ø)` | |
| [...stack/engine/orchestration/VolumeOrchestrator.java](https://codecov.io/gh/apache/cloudstack/pull/6939/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZW5naW5lL29yY2hlc3RyYXRpb24vc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL2Nsb3Vkc3RhY2svZW5naW5lL29yY2hlc3RyYXRpb24vVm9sdW1lT3JjaGVzdHJhdG9yLmphdmE=) | `0.00% <0.00%> (ø)` | |
| [.../src/main/java/com/cloud/vm/UserVmManagerImpl.java](https://codecov.io/gh/apache/cloudstack/pull/6939/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL3ZtL1VzZXJWbU1hbmFnZXJJbXBsLmphdmE=) | `6.70% <0.00%> (+<0.01%)` | :arrow_up: |
| [...dstack/network/contrail/model/ModelObjectBase.java](https://codecov.io/gh/apache/cloudstack/pull/6939/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGx1Z2lucy9uZXR3b3JrLWVsZW1lbnRzL2p1bmlwZXItY29udHJhaWwvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL2Nsb3Vkc3RhY2svbmV0d29yay9jb250cmFpbC9tb2RlbC9Nb2RlbE9iamVjdEJhc2UuamF2YQ==) | `21.15% <0.00%> (-7.70%)` | :arrow_down: |
| [...rg/apache/cloudstack/quota/QuotaStatementImpl.java](https://codecov.io/gh/apache/cloudstack/pull/6939/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZnJhbWV3b3JrL3F1b3RhL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9jbG91ZHN0YWNrL3F1b3RhL1F1b3RhU3RhdGVtZW50SW1wbC5qYXZh) | `40.26% <0.00%> (+3.98%)` | :arrow_up: |
:mega: We’re building smart automated test selection to slash your CI/CD build times. [Learn more](https://about.codecov.io/iterative-testing/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
--
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
[GitHub] [cloudstack] blueorangutan commented on pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#issuecomment-1342522088
<b>Trillian test result (tid-5421)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 39151 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6939-t5421-kvm-centos7.zip
Smoke tests completed. 105 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:
Test | Result | Time (s) | Test 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
[GitHub] [cloudstack] mlsorensen commented on pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
mlsorensen commented on PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#issuecomment-1341659908
@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
[GitHub] [cloudstack] blueorangutan commented on pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#issuecomment-1341660315
@mlsorensen a 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
[GitHub] [cloudstack] mlsorensen merged pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
mlsorensen merged PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939
--
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
[GitHub] [cloudstack] sonarcloud[bot] commented on pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
sonarcloud[bot] commented on PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#issuecomment-1334681431
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_cloudstack&pullRequest=6939)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6939&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6939&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6939&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=CODE_SMELL) [4 Code Smells](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6939&metric=new_coverage&view=list) [0.0% Coverage](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6939&metric=new_coverage&view=list)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6939&metric=new_duplicated_lines_density&view=list) [0.0% Duplication](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6939&metric=new_duplicated_lines_density&view=list)
--
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
[GitHub] [cloudstack] blueorangutan commented on pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#issuecomment-1335172901
@DaanHoogland a 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
[GitHub] [cloudstack] mprokopchuk commented on a diff in pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
mprokopchuk commented on code in PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#discussion_r1041490170
##########
engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java:
##########
@@ -485,15 +486,22 @@ public void doInTransactionWithoutResult(final TransactionStatus status) throws
s_logger.debug("Allocating disks for " + vmFinal);
}
- String rootVolumeName = String.format("ROOT-%s", vmFinal.getId());
- if (template.getFormat() == ImageFormat.ISO) {
- volumeMgr.allocateRawVolume(Type.ROOT, rootVolumeName, rootDiskOfferingInfo.getDiskOffering(), rootDiskOfferingInfo.getSize(),
- rootDiskOfferingInfo.getMinIops(), rootDiskOfferingInfo.getMaxIops(), vmFinal, template, owner, null);
- } else if (template.getFormat() == ImageFormat.BAREMETAL) {
- s_logger.debug(String.format("%s has format [%s]. Skipping ROOT volume [%s] allocation.", template.toString(), ImageFormat.BAREMETAL, rootVolumeName));
- } else {
- volumeMgr.allocateTemplatedVolumes(Type.ROOT, rootVolumeName, rootDiskOfferingInfo.getDiskOffering(), rootDiskSizeFinal,
- rootDiskOfferingInfo.getMinIops(), rootDiskOfferingInfo.getMaxIops(), template, vmFinal, owner);
+ // Create new Volume context and inject event resource type, id and details to generate VOLUME.CREATE event for the ROOT disk.
+ CallContext volumeContext = CallContext.register(CallContext.current(), ApiCommandResourceType.Volume);
+ try {
+ String rootVolumeName = String.format("ROOT-%s", vmFinal.getId());
+ if (template.getFormat() == ImageFormat.ISO) {
+ volumeMgr.allocateRawVolume(Type.ROOT, rootVolumeName, rootDiskOfferingInfo.getDiskOffering(), rootDiskOfferingInfo.getSize(),
+ rootDiskOfferingInfo.getMinIops(), rootDiskOfferingInfo.getMaxIops(), vmFinal, template, owner, null);
+ } else if (template.getFormat() == ImageFormat.BAREMETAL) {
+ s_logger.debug(String.format("%s has format [%s]. Skipping ROOT volume [%s] allocation.", template.toString(), ImageFormat.BAREMETAL, rootVolumeName));
+ } else {
+ volumeMgr.allocateTemplatedVolumes(Type.ROOT, rootVolumeName, rootDiskOfferingInfo.getDiskOffering(), rootDiskSizeFinal,
+ rootDiskOfferingInfo.getMinIops(), rootDiskOfferingInfo.getMaxIops(), template, vmFinal, owner);
+ }
+ } finally {
+ // Remove volumeContext and pop vmContext back
+ CallContext.unregister();
}
Review Comment:
Done.
##########
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java:
##########
@@ -871,7 +879,16 @@ public DiskProfile allocateRawVolume(Type type, String name, DiskOffering offeri
_resourceLimitMgr.incrementResourceCount(vm.getAccountId(), ResourceType.volume, vol.isDisplayVolume());
_resourceLimitMgr.incrementResourceCount(vm.getAccountId(), ResourceType.primary_storage, vol.isDisplayVolume(), new Long(vol.getSize()));
}
- return toDiskProfile(vol, offering);
+ DiskProfile diskProfile = toDiskProfile(vol, offering);
+
+ // Set context information for VOLUME.CREATE event for ROOT disk.
+ CallContext volumeContext = CallContext.current();
+ if (type == Type.ROOT && volumeContext != null && volumeContext.getEventResourceType() == ApiCommandResourceType.Volume) {
+ volumeContext.setEventDetails("Volume Id: " + this._uuidMgr.getUuid(Volume.class, diskProfile.getVolumeId()) + " Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, vm.getId()));
+ volumeContext.setEventResourceId(diskProfile.getVolumeId());
+ }
Review Comment:
Done.
--
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
[GitHub] [cloudstack] blueorangutan commented on pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#issuecomment-1341750778
@mlsorensen a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests
--
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
[GitHub] [cloudstack] blueorangutan commented on pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#issuecomment-1341703916
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 4809
--
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
[GitHub] [cloudstack] blueorangutan commented on pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#issuecomment-1338694887
<b>Trillian test result (tid-5394)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 36935 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6939-t5394-kvm-centos7.zip
Smoke tests completed. 104 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:
Test | Result | Time (s) | Test 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
[GitHub] [cloudstack] DaanHoogland commented on pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#issuecomment-1335172462
@mprokopchuk thanks for this enhancement. I wonder if this was a problem for more users than just you. It has been in here forever. My worry is that results from the usage service will be different and might create an issue for some users, but let's test that.
Can you have a look at
> SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_cloudstack&pullRequest=6939)
>
> [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6939&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6939&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6939&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=CODE_SMELL) [4 Code Smells](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6939&resolved=false&types=CODE_SMELL)
>
> [](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6939&metric=new_coverage&view=list) [0.0% Coverage](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6939&metric=new_coverage&view=list) [](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6939&metric=new_duplicated_lines_density&view=list) [0.0% Duplica
tion](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6939&metric=new_duplicated_lines_density&view=list)
@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
[GitHub] [cloudstack] DaanHoogland commented on a diff in pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on code in PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#discussion_r1038105245
##########
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java:
##########
@@ -871,7 +879,16 @@ public DiskProfile allocateRawVolume(Type type, String name, DiskOffering offeri
_resourceLimitMgr.incrementResourceCount(vm.getAccountId(), ResourceType.volume, vol.isDisplayVolume());
_resourceLimitMgr.incrementResourceCount(vm.getAccountId(), ResourceType.primary_storage, vol.isDisplayVolume(), new Long(vol.getSize()));
}
- return toDiskProfile(vol, offering);
+ DiskProfile diskProfile = toDiskProfile(vol, offering);
+
+ // Set context information for VOLUME.CREATE event for ROOT disk.
+ CallContext volumeContext = CallContext.current();
+ if (type == Type.ROOT && volumeContext != null && volumeContext.getEventResourceType() == ApiCommandResourceType.Volume) {
+ volumeContext.setEventDetails("Volume Id: " + this._uuidMgr.getUuid(Volume.class, diskProfile.getVolumeId()) + " Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, vm.getId()));
+ volumeContext.setEventResourceId(diskProfile.getVolumeId());
+ }
Review Comment:
can you extract this to a separate method?
##########
engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java:
##########
@@ -485,15 +486,22 @@ public void doInTransactionWithoutResult(final TransactionStatus status) throws
s_logger.debug("Allocating disks for " + vmFinal);
}
- String rootVolumeName = String.format("ROOT-%s", vmFinal.getId());
- if (template.getFormat() == ImageFormat.ISO) {
- volumeMgr.allocateRawVolume(Type.ROOT, rootVolumeName, rootDiskOfferingInfo.getDiskOffering(), rootDiskOfferingInfo.getSize(),
- rootDiskOfferingInfo.getMinIops(), rootDiskOfferingInfo.getMaxIops(), vmFinal, template, owner, null);
- } else if (template.getFormat() == ImageFormat.BAREMETAL) {
- s_logger.debug(String.format("%s has format [%s]. Skipping ROOT volume [%s] allocation.", template.toString(), ImageFormat.BAREMETAL, rootVolumeName));
- } else {
- volumeMgr.allocateTemplatedVolumes(Type.ROOT, rootVolumeName, rootDiskOfferingInfo.getDiskOffering(), rootDiskSizeFinal,
- rootDiskOfferingInfo.getMinIops(), rootDiskOfferingInfo.getMaxIops(), template, vmFinal, owner);
+ // Create new Volume context and inject event resource type, id and details to generate VOLUME.CREATE event for the ROOT disk.
+ CallContext volumeContext = CallContext.register(CallContext.current(), ApiCommandResourceType.Volume);
+ try {
+ String rootVolumeName = String.format("ROOT-%s", vmFinal.getId());
+ if (template.getFormat() == ImageFormat.ISO) {
+ volumeMgr.allocateRawVolume(Type.ROOT, rootVolumeName, rootDiskOfferingInfo.getDiskOffering(), rootDiskOfferingInfo.getSize(),
+ rootDiskOfferingInfo.getMinIops(), rootDiskOfferingInfo.getMaxIops(), vmFinal, template, owner, null);
+ } else if (template.getFormat() == ImageFormat.BAREMETAL) {
+ s_logger.debug(String.format("%s has format [%s]. Skipping ROOT volume [%s] allocation.", template.toString(), ImageFormat.BAREMETAL, rootVolumeName));
+ } else {
+ volumeMgr.allocateTemplatedVolumes(Type.ROOT, rootVolumeName, rootDiskOfferingInfo.getDiskOffering(), rootDiskSizeFinal,
+ rootDiskOfferingInfo.getMinIops(), rootDiskOfferingInfo.getMaxIops(), template, vmFinal, owner);
+ }
+ } finally {
+ // Remove volumeContext and pop vmContext back
+ CallContext.unregister();
}
Review Comment:
can you extract this to a separate method?
##########
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java:
##########
@@ -1006,6 +1024,14 @@ public List<DiskProfile> allocateTemplatedVolumes(Type type, String name, DiskOf
profiles.add(diskProfile);
}
+ // Set context information for VOLUME.CREATE event for ROOT disk.
+ CallContext volumeContext = CallContext.current();
+ if (type == Type.ROOT && volumeContext != null && volumeContext.getEventResourceType() == ApiCommandResourceType.Volume) {
+ String volumeIds = profiles.stream().map(diskProfile -> this._uuidMgr.getUuid(Volume.class, diskProfile.getVolumeId())).collect(Collectors.joining(", "));
+ volumeContext.setEventDetails("Volume Id: " + volumeIds + " Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, vm.getId()));
+ volumeContext.setEventResourceId(profiles.stream().findFirst().map(DiskProfile::getVolumeId).orElse(null));
+ }
Review Comment:
can you extract this to a separate method?
--
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
[GitHub] [cloudstack] blueorangutan commented on pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#issuecomment-1337730857
@DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests
--
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
[GitHub] [cloudstack] mprokopchuk commented on a diff in pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
mprokopchuk commented on code in PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#discussion_r1041490373
##########
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java:
##########
@@ -1006,6 +1024,14 @@ public List<DiskProfile> allocateTemplatedVolumes(Type type, String name, DiskOf
profiles.add(diskProfile);
}
+ // Set context information for VOLUME.CREATE event for ROOT disk.
+ CallContext volumeContext = CallContext.current();
+ if (type == Type.ROOT && volumeContext != null && volumeContext.getEventResourceType() == ApiCommandResourceType.Volume) {
+ String volumeIds = profiles.stream().map(diskProfile -> this._uuidMgr.getUuid(Volume.class, diskProfile.getVolumeId())).collect(Collectors.joining(", "));
+ volumeContext.setEventDetails("Volume Id: " + volumeIds + " Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, vm.getId()));
+ volumeContext.setEventResourceId(profiles.stream().findFirst().map(DiskProfile::getVolumeId).orElse(null));
+ }
Review Comment:
Done.
--
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
[GitHub] [cloudstack] mlsorensen commented on pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
mlsorensen commented on PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#issuecomment-1342964396
Merging based on two approvals, manual testing, and no smoke test errors.
--
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
[GitHub] [cloudstack] blueorangutan commented on pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#issuecomment-1335260489
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 4748
--
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
[GitHub] [cloudstack] DaanHoogland commented on pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#issuecomment-1337729890
@blueorangutan test
--
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
[GitHub] [cloudstack] mlsorensen commented on pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
mlsorensen commented on PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#issuecomment-1341659527
@blueorangutan test
--
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
[GitHub] [cloudstack] mlsorensen commented on pull request #6939: When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event
Posted by GitBox <gi...@apache.org>.
mlsorensen commented on PR #6939:
URL: https://github.com/apache/cloudstack/pull/6939#issuecomment-1341749976
@blueorangutan test
--
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