You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by "gpordeus (via GitHub)" <gi...@apache.org> on 2024/02/23 13:38:07 UTC
[PR] Fix XenServer nested extra configuration [cloudstack]
gpordeus opened a new pull request, #8698:
URL: https://github.com/apache/cloudstack/pull/8698
### Description
This PR fixes a problem when trying to boot up a XenServer VM with a template through an ISO.
Steps to reproduce:
- Enable `enable.additional.vm.configuration` and add `HVM-boot-params:order` to `allow.additional.vm.configuration.list.xen`.
- Create a XenServer VM with a template.
- Attach an ISO to it.
- Call `updateVirtualMachine` with parameter `extraconfig=HVM-boot-params:order%3Ddcn`
- Start up the VM.
It will not finish, with the following log message:
```
INFO [c.c.h.x.r.XenServer650Resource] (DirectAgent-71:[ctx-6c7bfe3d]) (logid:faabbafa) Appending user extra configuration settings to VM
ERROR [o.a.c.h.x.ExtraConfigurationUtility] (DirectAgent-71:[ctx-6c7bfe3d]) (logid:faabbafa) Exception caught while setting VM configuration. exception: null
```
After fixing the exception message, we get:
```
ERROR [o.a.c.h.x.ExtraConfigurationUtility] (DirectAgent-25:ctx-0d31d123) (logid:aa40d07d) Exception caught while setting VM configuration: [You tried to add a key-value pair to a map, but that key is already there.]
```
This PR fixes the exception message and changes the Xen API method called from `addTo` to `set` with `get`, letting Java substitute any duplicates in the HashMap.
### 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)
- [ ] build/CI
### Feature/Enhancement Scale or Bug Severity
#### Bug Severity
- [ ] BLOCKER
- [ ] Critical
- [X] Major
- [ ] Minor
- [ ] Trivial
### Screenshots (if appropriate):
### How Has This Been Tested?
I repeated the steps to reproduce the error and verified the VM with template started up sucessfully, booting the ISO.
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland closed pull request #8698: Fix XenServer nested extra configuration
URL: https://github.com/apache/cloudstack/pull/8698
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "gpordeus (via GitHub)" <gi...@apache.org>.
gpordeus commented on code in PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#discussion_r1504659299
##########
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java:
##########
@@ -1972,7 +1972,7 @@ protected void finalizeVmMetaData(final VM vm, final VM.Record vmr, final Connec
// Add configuration settings VM record for User VM instances before creating VM
Map<String, String> extraConfig = vmSpec.getExtraConfig();
if (vmSpec.getType().equals(VirtualMachine.Type.User) && MapUtils.isNotEmpty(extraConfig)) {
- logger.info("Appending user extra configuration settings to VM");
+ logger.info("Appending user extra configuration settings [{}] to [{}].", extraConfig, vmSpec));
Review Comment:
```suggestion
logger.info("Appending user extra configuration settings [{}] to [{}].", extraConfig, vmSpec);
```
Oops, an extra parenthesis sneaked in there and I hadn't tested them locally again. It should be fine, now.
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "gpordeus (via GitHub)" <gi...@apache.org>.
gpordeus commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1961602112
@DaanHoogland Thanks for the review.
> CLGTM, but don't you think the replacement code should be called inside the `VirtualMachine.add<>()` methods, @gpordeus ?
Do you mean the original methods (`VM.addToVCPUsParams()`, `VM.addToHVMBootParams()`, etc)? It would be better, but those are part of the xenapi :/
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-2012121406
@vishesh92 is this alright to you?
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "vishesh92 (via GitHub)" <gi...@apache.org>.
vishesh92 commented on code in PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#discussion_r1503279172
##########
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java:
##########
@@ -1972,7 +1972,7 @@ protected void finalizeVmMetaData(final VM vm, final VM.Record vmr, final Connec
// Add configuration settings VM record for User VM instances before creating VM
Map<String, String> extraConfig = vmSpec.getExtraConfig();
if (vmSpec.getType().equals(VirtualMachine.Type.User) && MapUtils.isNotEmpty(extraConfig)) {
- logger.info("Appending user extra configuration settings to VM");
+ logger.info("Appending user extra configuration settings [{}] to [{}].", extraConfig, vmSpec));
Review Comment:
```suggestion
logger.info(String.format("Appending user extra configuration settings [{}] to [{}].", extraConfig, vmSpec));
```
Checkstyle failing because of this
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-2001849276
<b>[SF] Trillian test result (tid-9505)</b>
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server r8
Total time taken: 44292 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8698-t9505-xenserver-71.zip
Smoke tests completed. 129 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
Re: [PR] Fix XenServer nested extra configuration [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1968402054
@DaanHoogland 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] Fix XenServer nested extra configuration [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on code in PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#discussion_r1500696327
##########
plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/hypervisor/xenserver/ExtraConfigurationUtility.java:
##########
@@ -71,26 +77,26 @@ private static void applyConfigWithNestedKeyValue(Connection conn, VM vm, Map<St
try {
switch (actualParam) {
case "VCPUs_params":
- vm.addToVCPUsParams(conn, keyName, paramValue);
+ vm.setVCPUsParams(conn, putInMap(vm.getVCPUsParams(conn), keyName, paramValue));
break;
case "platform":
- vm.addToOtherConfig(conn, keyName, paramValue);
+ vm.setOtherConfig(conn, putInMap(vm.getOtherConfig(conn), keyName, paramValue));
break;
case "HVM_boot_params":
- vm.addToHVMBootParams(conn, keyName, paramValue);
+ vm.setHVMBootParams(conn, putInMap(vm.getHVMBootParams(conn), keyName, paramValue));
break;
case "other_config":
- vm.addToOtherConfig(conn, keyName, paramValue);
+ vm.setOtherConfig(conn, putInMap(vm.getOtherConfig(conn), keyName, paramValue));
break;
case "xenstore_data":
- vm.addToXenstoreData(conn, keyName, paramValue);
+ vm.setXenstoreData(conn, putInMap(vm.getXenstoreData(conn), keyName, paramValue));
break;
default:
String msg = String.format("Passed configuration %s is not supported", paramKey);
LOGGER.warn(msg);
}
} catch (XmlRpcException | Types.XenAPIException e) {
- LOGGER.error("Exception caught while setting VM configuration. exception: " + e.getMessage());
+ LOGGER.error(String.format("Exception caught while setting VM configuration: [%s]", e.getMessage() == null ? e.toString() : e.getMessage()), e);
Review Comment:
rather no stack traces on error level
```suggestion
LOGGER.error("Exception caught while setting VM configuration: [{}]", e.getMessage() == null ? e.toString() : e.getMessage());
LOGGER.debug("Exception caught while setting VM configuration", e);
```
##########
plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/hypervisor/xenserver/ExtraConfigurationUtility.java:
##########
@@ -43,6 +43,7 @@ public static void setExtraConfigurationToVm(Connection conn, VM.Record vmr, VM
String paramValue = configParams.get(paramKey);
//Map params
+ LOGGER.debug(String.format("Applying [%s] configuration as [%s].", paramKey, paramValue));
Review Comment:
```suggestion
LOGGER.debug("Applying [{}] configuration as [{}].", paramKey, paramValue);
```
##########
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java:
##########
@@ -1972,7 +1972,7 @@ protected void finalizeVmMetaData(final VM vm, final VM.Record vmr, final Connec
// Add configuration settings VM record for User VM instances before creating VM
Map<String, String> extraConfig = vmSpec.getExtraConfig();
if (vmSpec.getType().equals(VirtualMachine.Type.User) && MapUtils.isNotEmpty(extraConfig)) {
- logger.info("Appending user extra configuration settings to VM");
+ logger.info(String.format("Appending user extra configuration settings [%s] to [%s].", extraConfig, vmSpec));
Review Comment:
```suggestion
logger.info("Appending user extra configuration settings [{}] to [{}].", extraConfig, vmSpec));
```
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1961628341
@DaanHoogland 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] Fix XenServer nested extra configuration [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1961626367
@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] Fix XenServer nested extra configuration [cloudstack]
Posted by "weizhouapache (via GitHub)" <gi...@apache.org>.
weizhouapache commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1965170657
> > @gpordeus Unit tests are failing during build. Can you check & fix those?
>
> @DaanHoogland @vishesh92
> It seems the test failed because dl.openvm.eu was down at the time. Could you run them again?
>
> ```
> [INFO] Installing /home/runner/work/cloudstack/cloudstack/framework/quota/pom.xml to /home/runner/.m2/repository/org/apache/cloudstack/cloud-framework-quota/4.20.0.0-SNAPSHOT/cloud-framework-quota-4.20.0.0-SNAPSHOT.pom
> 16:29:16.334 [main] ERROR org.apache.cloudstack.direct.download.HttpDirectTemplateDownloader - Cannot reach URL: http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-kvm.qcow2.bz2 due to: dl.openvm.eu
> java.net.UnknownHostException: dl.openvm.eu
> at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:229) ~[?:?]
> at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[?:?]
> at java.net.Socket.connect(Socket.java:609) ~[?:?]
> at java.net.Socket.connect(Socket.java:558) ~[?:?]
> at java.net.Socket.<init>(Socket.java:454) ~[?:?]
> at java.net.Socket.<init>(Socket.java:306) ~[?:?]
> at org.apache.commons.httpclient.protocol.DefaultProtocolSocketFactory.createSocket(DefaultProtocolSocketFactory.java:80) ~[commons-httpclient-3.1.jar:?]
> at org.apache.commons.httpclient.protocol.ControllerThreadSocketFactory$1.doit(ControllerThreadSocketFactory.java:91) ~[commons-httpclient-3.1.jar:?]
> at org.apache.commons.httpclient.protocol.ControllerThreadSocketFactory$SocketTask.run(ControllerThreadSocketFactory.java:158) ~[commons-httpclient-3.1.jar:?]
> at java.lang.Thread.run(Thread.java:829) ~[?:?]
> Error: Tests run: 1, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 10.965 s <<< FAILURE! - in org.apache.cloudstack.direct.download.MetalinkDirectTemplateDownloaderTest
> Error: testCheckUrlMetalink(org.apache.cloudstack.direct.download.MetalinkDirectTemplateDownloaderTest) Time elapsed: 10.964 s <<< FAILURE!
> java.lang.AssertionError
> at org.apache.cloudstack.direct.download.MetalinkDirectTemplateDownloaderTest.testCheckUrlMetalink(MetalinkDirectTemplateDownloaderTest.java:34)
> ```
The server is not down.
But the domain name can not be resolved by some DNS servers (e.g. 8.8.8.8)
Please try 1.1.1.1
@DaanHoogland @NuxRo
We probably can move templates to download.cloudstack.org
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1965171634
@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] Fix XenServer nested extra configuration [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1968400528
@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] Fix XenServer nested extra configuration [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1976033947
> alma9 xcpng82
@gpordeus the test run with these env specs fails a bit, is that expected? what did you use?
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on code in PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#discussion_r1503844028
##########
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java:
##########
@@ -1972,7 +1972,7 @@ protected void finalizeVmMetaData(final VM vm, final VM.Record vmr, final Connec
// Add configuration settings VM record for User VM instances before creating VM
Map<String, String> extraConfig = vmSpec.getExtraConfig();
if (vmSpec.getType().equals(VirtualMachine.Type.User) && MapUtils.isNotEmpty(extraConfig)) {
- logger.info("Appending user extra configuration settings to VM");
+ logger.info("Appending user extra configuration settings [{}] to [{}].", extraConfig, vmSpec));
Review Comment:
hm, that sounds like a bug in checkstyle, does it?
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on code in PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#discussion_r1505487713
##########
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java:
##########
@@ -1972,7 +1972,7 @@ protected void finalizeVmMetaData(final VM vm, final VM.Record vmr, final Connec
// Add configuration settings VM record for User VM instances before creating VM
Map<String, String> extraConfig = vmSpec.getExtraConfig();
if (vmSpec.getType().equals(VirtualMachine.Type.User) && MapUtils.isNotEmpty(extraConfig)) {
- logger.info("Appending user extra configuration settings to VM");
+ logger.info("Appending user extra configuration settings [{}] to [{}].", extraConfig, vmSpec));
Review Comment:
my bad to sugest that change
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1999815398
@weizhouapache a [SL] Trillian-Jenkins test job (rocky8 mgmt + xenserver-71) 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
Re: [PR] Fix XenServer nested extra configuration [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland merged PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1968564441
@DaanHoogland a [SL] Trillian-Jenkins test job (alma9 mgmt + xcpng82) 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
Re: [PR] Fix XenServer nested extra configuration [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1961647378
Packaging result [SF]: ✖️ el7 ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 8761
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "gpordeus (via GitHub)" <gi...@apache.org>.
gpordeus commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1992084131
> @gpordeus the test run with these env specs fails a bit, is that expected? what did you use?
I tested it manually on a local ubuntu lab with xcp-ng-8.2 host. I didn't run the integration tests, but I believe these are related to #8586, since the same tests are acting up (`cluster_drs`, `nonstrict_affinity_group`, `register_userdata` and `vm_deployment_planner`).
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1961625022
> @DaanHoogland Thanks for the review.
>
> > CLGTM, but don't you think the replacement code should be called inside the `VirtualMachine.add<>()` methods, @gpordeus ?
>
> Do you mean the original methods (`VM.addToVCPUsParams()`, `VM.addToHVMBootParams()`, etc)? It would be better, but those are part of the xenapi :/
right, I thought these were in a wrapper :( ok, don't bother
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "vishesh92 (via GitHub)" <gi...@apache.org>.
vishesh92 commented on code in PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#discussion_r1503279172
##########
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java:
##########
@@ -1972,7 +1972,7 @@ protected void finalizeVmMetaData(final VM vm, final VM.Record vmr, final Connec
// Add configuration settings VM record for User VM instances before creating VM
Map<String, String> extraConfig = vmSpec.getExtraConfig();
if (vmSpec.getType().equals(VirtualMachine.Type.User) && MapUtils.isNotEmpty(extraConfig)) {
- logger.info("Appending user extra configuration settings to VM");
+ logger.info("Appending user extra configuration settings [{}] to [{}].", extraConfig, vmSpec));
Review Comment:
```suggestion
logger.info(String.format("Appending user extra configuration settings [{}] to [{}].", extraConfig, vmSpec));
```
Checkstyle failing because of this
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "gpordeus (via GitHub)" <gi...@apache.org>.
gpordeus commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1965162411
> @gpordeus Unit tests are failing during build. Can you check & fix those?
@DaanHoogland @vishesh92
It seems the test failed because dl.openvm.eu was down at the time. Could you run them again?
```
[INFO] Installing /home/runner/work/cloudstack/cloudstack/framework/quota/pom.xml to /home/runner/.m2/repository/org/apache/cloudstack/cloud-framework-quota/4.20.0.0-SNAPSHOT/cloud-framework-quota-4.20.0.0-SNAPSHOT.pom
16:29:16.334 [main] ERROR org.apache.cloudstack.direct.download.HttpDirectTemplateDownloader - Cannot reach URL: http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-kvm.qcow2.bz2 due to: dl.openvm.eu
java.net.UnknownHostException: dl.openvm.eu
at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:229) ~[?:?]
at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[?:?]
at java.net.Socket.connect(Socket.java:609) ~[?:?]
at java.net.Socket.connect(Socket.java:558) ~[?:?]
at java.net.Socket.<init>(Socket.java:454) ~[?:?]
at java.net.Socket.<init>(Socket.java:306) ~[?:?]
at org.apache.commons.httpclient.protocol.DefaultProtocolSocketFactory.createSocket(DefaultProtocolSocketFactory.java:80) ~[commons-httpclient-3.1.jar:?]
at org.apache.commons.httpclient.protocol.ControllerThreadSocketFactory$1.doit(ControllerThreadSocketFactory.java:91) ~[commons-httpclient-3.1.jar:?]
at org.apache.commons.httpclient.protocol.ControllerThreadSocketFactory$SocketTask.run(ControllerThreadSocketFactory.java:158) ~[commons-httpclient-3.1.jar:?]
at java.lang.Thread.run(Thread.java:829) ~[?:?]
Error: Tests run: 1, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 10.965 s <<< FAILURE! - in org.apache.cloudstack.direct.download.MetalinkDirectTemplateDownloaderTest
Error: testCheckUrlMetalink(org.apache.cloudstack.direct.download.MetalinkDirectTemplateDownloaderTest) Time elapsed: 10.964 s <<< FAILURE!
java.lang.AssertionError
at org.apache.cloudstack.direct.download.MetalinkDirectTemplateDownloaderTest.testCheckUrlMetalink(MetalinkDirectTemplateDownloaderTest.java:34)
```
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "vishesh92 (via GitHub)" <gi...@apache.org>.
vishesh92 commented on code in PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#discussion_r1503279172
##########
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java:
##########
@@ -1972,7 +1972,7 @@ protected void finalizeVmMetaData(final VM vm, final VM.Record vmr, final Connec
// Add configuration settings VM record for User VM instances before creating VM
Map<String, String> extraConfig = vmSpec.getExtraConfig();
if (vmSpec.getType().equals(VirtualMachine.Type.User) && MapUtils.isNotEmpty(extraConfig)) {
- logger.info("Appending user extra configuration settings to VM");
+ logger.info("Appending user extra configuration settings [{}] to [{}].", extraConfig, vmSpec));
Review Comment:
```suggestion
logger.info("Appending user extra configuration settings [{}] to [{}].", extraConfig, vmSpec);
```
Checkstyle failing because of this
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1968510738
Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 8804
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1968561991
@blueorangutan test alma9 xcpng82
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1970400998
<b>[SF] Trillian test result (tid-9338)</b>
Environment: xcpng82 (x2), Advanced Networking with Mgmt server a9
Total time taken: 68936 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8698-t9338-xcpng82.zip
Smoke tests completed. 125 look OK, 4 have errors, 0 did not run
Only failed and skipped tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_01_condensed_drs_algorithm | `Failure` | 170.44 | test_cluster_drs.py
test_02_balanced_drs_algorithm | `Failure` | 180.24 | test_cluster_drs.py
test_01_non_strict_host_anti_affinity | `Error` | 207.99 | test_nonstrict_affinity_group.py
test_02_non_strict_host_affinity | `Error` | 114.43 | test_nonstrict_affinity_group.py
test_deploy_vm_with_registered_userdata | `Error` | 829.04 | test_register_userdata.py
test_deploy_vm_with_registered_userdata_with_override_policy_allow | `Error` | 859.04 | test_register_userdata.py
test_deploy_vm_with_registered_userdata_with_override_policy_append | `Error` | 826.68 | test_register_userdata.py
test_deploy_vm_with_registered_userdata_with_params | `Error` | 840.29 | test_register_userdata.py
test_01_deploy_vm_on_specific_host | `Error` | 0.09 | test_vm_deployment_planner.py
test_02_deploy_vm_on_specific_cluster | `Error` | 0.09 | test_vm_deployment_planner.py
test_03_deploy_vm_on_specific_pod | `Error` | 0.11 | test_vm_deployment_planner.py
test_04_deploy_vm_on_host_override_pod_and_cluster | `Error` | 0.15 | test_vm_deployment_planner.py
test_05_deploy_vm_on_cluster_override_pod | `Error` | 0.10 | test_vm_deployment_planner.py
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "weizhouapache (via GitHub)" <gi...@apache.org>.
weizhouapache commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1999812911
@blueorangutan test rocky8 xenserver-71
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "codecov[bot] (via GitHub)" <gi...@apache.org>.
codecov[bot] commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1961411502
## [Codecov](https://app.codecov.io/gh/apache/cloudstack/pull/8698?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 4.36%. Comparing base [(`8f6721e`)](https://app.codecov.io/gh/apache/cloudstack/commit/8f6721ed4c4e1b31081a951c62ffbe5331cf16d4?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) to head [(`817ebb6`)](https://app.codecov.io/gh/apache/cloudstack/pull/8698?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache).
<details><summary>Additional details and impacted files</summary>
```diff
@@ Coverage Diff @@
## main #8698 +/- ##
============================================
- Coverage 30.90% 4.36% -26.54%
============================================
Files 5355 361 -4994
Lines 375727 28835 -346892
Branches 54915 5037 -49878
============================================
- Hits 116109 1259 -114850
+ Misses 244219 27437 -216782
+ Partials 15399 139 -15260
```
| [Flag](https://app.codecov.io/gh/apache/cloudstack/pull/8698/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | Coverage Δ | |
|---|---|---|
| [simulator-marvin-tests](https://app.codecov.io/gh/apache/cloudstack/pull/8698/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | `?` | |
| [uitests](https://app.codecov.io/gh/apache/cloudstack/pull/8698/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | `4.36% <ø> (ø)` | |
| [unit-tests](https://app.codecov.io/gh/apache/cloudstack/pull/8698/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/8698?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).
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1999796057
> > @gpordeus the test run with these env specs fails a bit, is that expected? what did you use?
>
> I tested it manually on a local ubuntu lab with xcp-ng-8.2 host. I didn't run the integration tests, but I believe these are related to #8586, since the same tests are acting up (`cluster_drs`, `nonstrict_affinity_group`, `register_userdata` and `vm_deployment_planner`).
@weizhouapache , can you review?
@gpordeus , can you run the integration tests to see?
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "vishesh92 (via GitHub)" <gi...@apache.org>.
vishesh92 commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1963307628
@gpordeus Unit tests are failing during build. Can you check & fix those?
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1965172699
@DaanHoogland 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] Fix XenServer nested extra configuration [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#issuecomment-1965233071
Packaging result [SF]: ✖️ el7 ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 8795
--
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] Fix XenServer nested extra configuration [cloudstack]
Posted by "vishesh92 (via GitHub)" <gi...@apache.org>.
vishesh92 commented on code in PR #8698:
URL: https://github.com/apache/cloudstack/pull/8698#discussion_r1503279172
##########
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java:
##########
@@ -1972,7 +1972,7 @@ protected void finalizeVmMetaData(final VM vm, final VM.Record vmr, final Connec
// Add configuration settings VM record for User VM instances before creating VM
Map<String, String> extraConfig = vmSpec.getExtraConfig();
if (vmSpec.getType().equals(VirtualMachine.Type.User) && MapUtils.isNotEmpty(extraConfig)) {
- logger.info("Appending user extra configuration settings to VM");
+ logger.info("Appending user extra configuration settings [{}] to [{}].", extraConfig, vmSpec));
Review Comment:
Checkstyle failing because of this
--
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