xen/xcpng: set vmr.VCPUsMax to minimum of global setting and host cpu cores #7887

weizhouapache · 2023-08-21T11:52:33Z

This fixes #7375

Description

This PR...

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)
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
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

This fixes apache#7375

weizhouapache · 2023-08-21T11:52:53Z

@blueorangutan package

blueorangutan · 2023-08-21T11:54:03Z

@weizhouapache a [SF] 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.

blueorangutan · 2023-08-21T12:47:13Z

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 6841

codecov · 2023-08-21T12:47:22Z

Codecov Report

Merging #7887 (d72745f) into 4.18 (3c38ed7) will decrease coverage by 0.01%.
Report is 9 commits behind head on 4.18.
The diff coverage is 0.00%.

@@             Coverage Diff              @@
##               4.18    #7887      +/-   ##
============================================
- Coverage     13.06%   13.06%   -0.01%     
- Complexity     9088     9093       +5     
============================================
  Files          2720     2720              
  Lines        257391   257431      +40     
  Branches      40130    40141      +11     
============================================
+ Hits          33621    33622       +1     
- Misses       219548   219582      +34     
- Partials       4222     4227       +5

Files Changed	Coverage Δ
...stack/engine/orchestration/VolumeOrchestrator.java	`1.89% <0.00%> (ø)`
...visor/vmware/manager/VmwareStorageManagerImpl.java	`6.20% <0.00%> (-0.03%)`	⬇️
...oud/hypervisor/vmware/resource/VmwareResource.java	`4.48% <0.00%> (-0.01%)`	⬇️
...cloud/storage/resource/VmwareStorageProcessor.java	`0.32% <0.00%> (-0.01%)`	⬇️
.../main/java/com/cloud/hypervisor/XenServerGuru.java	`49.45% <0.00%> (+3.05%)`	⬆️
...ervisor/xenserver/resource/CitrixResourceBase.java	`4.51% <0.00%> (ø)`
...astore/driver/SolidFirePrimaryDataStoreDriver.java	`0.00% <0.00%> (ø)`
...src/main/java/com/cloud/api/ApiResponseHelper.java	`4.53% <0.00%> (ø)`
.../cloud/configuration/ConfigurationManagerImpl.java	`15.46% <0.00%> (-0.05%)`	⬇️
...n/java/com/cloud/network/IpAddressManagerImpl.java	`3.14% <0.00%> (-0.11%)`	⬇️
... and 2 more

... and 4 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

weizhouapache · 2023-08-21T13:23:17Z

@blueorangutan test rocky8 xcpng-82

blueorangutan · 2023-08-21T13:24:03Z

@weizhouapache [SF] unsupported parameters provided. Supported mgmt server os are: centos7, centos6, suse15, alma8, ubuntu18, ubuntu22, ubuntu20, rocky8, alma9. Supported hypervisors are: kvm-centos6, kvm-centos7, kvm-rocky8, kvm-alma8, kvm-alma9, kvm-ubuntu18, kvm-ubuntu20, kvm-ubuntu22, kvm-suse15, vmware-55u3, vmware-60u2, vmware-65u2, vmware-67u3, vmware-70u1, vmware-70u2, vmware-70u3, vmware-80, vmware-80u1, xenserver-65sp1, xenserver-71, xenserver-74, xcpng74, xcpng76, xcpng80, xcpng81, xcpng82

weizhouapache · 2023-08-21T13:37:37Z

@blueorangutan test rocky8 xcpng82

blueorangutan · 2023-08-21T13:38:03Z

@weizhouapache a [SF] Trillian-Jenkins test job (rocky8 mgmt + xcpng82) has been kicked to run smoke tests

weizhouapache · 2023-08-21T13:43:53Z

@blueorangutan test rocky8 xenserver-71

blueorangutan · 2023-08-21T13:46:03Z

@weizhouapache a [SF] Trillian-Jenkins test job (rocky8 mgmt + xenserver-71) has been kicked to run smoke tests

blueorangutan · 2023-08-22T06:37:37Z

[SF] Trillian test result (tid-7499)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 39997 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7887-t7499-xenserver-71.zip
Smoke tests completed. 108 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

blueorangutan · 2023-08-22T07:18:37Z

[SF] Trillian test result (tid-7490)
Environment: xcpng82 (x2), Advanced Networking with Mgmt server r8
Total time taken: 62077 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7887-t7490-xcpng82.zip
Smoke tests completed. 103 look OK, 5 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_01_non_strict_host_anti_affinity	`Error`	195.62	test_nonstrict_affinity_group.py
test_02_non_strict_host_affinity	`Error`	120.50	test_nonstrict_affinity_group.py
test_deploy_vm_with_registered_userdata	`Error`	809.85	test_register_userdata.py
test_deploy_vm_with_registered_userdata_with_override_policy_allow	`Error`	834.18	test_register_userdata.py
test_deploy_vm_with_registered_userdata_with_override_policy_append	`Error`	812.00	test_register_userdata.py
test_deploy_vm_with_registered_userdata_with_params	`Error`	857.08	test_register_userdata.py
test_01_scale_vm	`Error`	136.66	test_scale_vm.py
test_04_scale_vm_with_user_account	`Error`	153.96	test_scale_vm.py
test_05_scale_vm_dont_allow_disk_offering_change	`Error`	34.13	test_scale_vm.py
test_list_vms_metrics_admin	`Error`	0.22	test_metrics_api.py
test_list_vms_metrics_history	`Error`	0.18	test_metrics_api.py
test_list_volumes_metrics_history	`Error`	0.17	test_metrics_api.py
test_01_deploy_vm_on_specific_host	`Error`	0.11	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.10	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

weizhouapache · 2023-08-22T07:54:58Z

@blueorangutan test centos7 xcpng-82 keepEnv

blueorangutan · 2023-08-28T08:04:03Z

@weizhouapache a [SF] 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.

blueorangutan · 2023-08-28T08:07:45Z

Packaging result [SF]: ✖️ el7 ✔️ debian. SL-JID 6909

...sors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java

…or/xenserver/resource/CitrixResourceBase.java Co-authored-by: dahn <daan.hoogland@gmail.com>

weizhouapache · 2023-08-28T08:41:45Z

@blueorangutan package

blueorangutan · 2023-08-28T08:42:03Z

@weizhouapache a [SF] 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.

blueorangutan · 2023-08-28T08:54:57Z

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 6911

blueorangutan · 2023-08-28T09:01:58Z

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 6913

...sors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java

…or/xenserver/resource/CitrixResourceBase.java

...sors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java

…or/xenserver/resource/CitrixResourceBase.java

weizhouapache · 2023-08-28T09:09:33Z

@blueorangutan package

blueorangutan · 2023-08-28T09:10:03Z

@weizhouapache a [SF] 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.

DaanHoogland

clgtm

harikrishna-patnala

Code LGTM

blueorangutan · 2023-08-28T10:07:17Z

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 6914

weizhouapache · 2023-08-28T10:43:55Z

@blueorangutan test rocky8 xenserver-71

blueorangutan · 2023-08-28T10:46:03Z

@weizhouapache a [SF] Trillian-Jenkins test job (rocky8 mgmt + xenserver-71) has been kicked to run smoke tests

weizhouapache · 2023-08-28T11:27:29Z

@DaanHoogland @harikrishna-patnala @shwstppr
I have manually tested ok

The env have 2 hosts (3 sockets, 1 cpu per socket)

MariaDB [cloud]> select cpus,cpu_sockets from host where type='Routing';
+------+-------------+
| cpus | cpu_sockets |
+------+-------------+
|    3 |           3 |
|    3 |           3 |
+------+-------------+
2 rows in set (0.00 sec)

Updated db manually to simulate hosts with 1 socket and 3 cpus per socket.

MariaDB [cloud]> update host set cpu_sockets  = 1 where type='Routing';
Query OK, 2 rows affected (0.01 sec)
Rows matched: 2  Changed: 2  Warnings: 0

MariaDB [cloud]> 
MariaDB [cloud]> select cpus,cpu_sockets from host where type='Routing';
+------+-------------+
| cpus | cpu_sockets |
+------+-------------+
|    3 |           1 |
|    3 |           1 |
+------+-------------+
2 rows in set (0.00 sec)

changed global/zone configuration to enable dynamic scale
enable.dynamic.scale.vm = true
changed template to "Dynamically scalable"
created a service offering with 2 cpus and 1GB memory
create a vm with the new service offering and template

without this PR, it failed

com.cloud.utils.exception.CloudRuntimeException: Unable to start VM(i-2-21-VM) on host(4282a91e-dc93-4305-a21a-d87ce4fe7e87) due to Task failed! Task record:                 uuid: 5f732b21-7e74-cf31-2cf4-ddc4f48517bc
           nameLabel: Async.VM.start_on
     nameDescription:
   allowedOperations: []
   currentOperations: {}
             created: Mon Aug 28 10:39:13 UTC 2023
            finished: Mon Aug 28 10:39:13 UTC 2023
              status: failure
          residentOn: com.xensource.xenapi.Host@b83408c7
            progress: 1.0
                type: <none/>
              result:
           errorInfo: [VALUE_NOT_SUPPORTED, VCPUs-at-startup, 2, value greater than VCPUs-max]
         otherConfig: {}
           subtaskOf: com.xensource.xenapi.Task@aaf13f6f
            subtasks: []

with this PR, succeed to create a vm

weizhouapache · 2023-08-28T11:27:59Z

@blueorangutan test rocky8 xenserver-71

blueorangutan · 2023-08-28T11:30:03Z

@weizhouapache a [SF] Trillian-Jenkins test job (rocky8 mgmt + xenserver-71) has been kicked to run smoke tests

DaanHoogland · 2023-08-28T12:25:55Z

reproduced and validated 👍

* 4.18: xen/xcpng: set vmr.VCPUsMax to minimum of global setting and host cpu cores (#7887)

blueorangutan · 2023-08-28T23:10:30Z

[SF] Trillian test result (tid-7590)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server r8
Total time taken: 40529 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7887-t7590-xenserver-71.zip
Smoke tests completed. 108 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

xen/xcpng: revert java changes in PR apache#4672

a83b902

This fixes apache#7375

boring-cyborg bot added the component:XenServer label Aug 21, 2023

weizhouapache linked an issue Aug 21, 2023 that may be closed by this pull request

Can't create or scale VM to more then 2 vcpus. XCP-NG. #7375

Closed

weizhouapache mentioned this pull request Aug 21, 2023

Can't create or scale VM to more then 2 vcpus. XCP-NG. #7375

Closed

weizhouapache added this to the 4.18.1.0 milestone Aug 21, 2023

weizhouapache added the status:ready-for-sonar-check This PR is safe for Sonar Quality Check label Aug 22, 2023

weizhouapache removed the status:ready-for-sonar-check This PR is safe for Sonar Quality Check label Aug 22, 2023

weizhouapache changed the base branch from 4.18 to 4.18-enable-sonar-check-by-label August 22, 2023 07:53

apache deleted a comment from blueorangutan Aug 22, 2023

weizhouapache closed this Aug 22, 2023

weizhouapache reopened this Aug 22, 2023

weizhouapache added the status:ready-for-sonar-check This PR is safe for Sonar Quality Check label Aug 22, 2023

weizhouapache changed the base branch from 4.18-enable-sonar-check-by-label to 4.18 August 22, 2023 08:00

Merge branch '4.18' into 4.18-xcpng-revert-pr4672

f72a3de

DaanHoogland reviewed Aug 28, 2023

View reviewed changes

...sors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java Outdated Show resolved Hide resolved

Update plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervis…

9f15636

…or/xenserver/resource/CitrixResourceBase.java Co-authored-by: dahn <daan.hoogland@gmail.com>

weizhouapache commented Aug 28, 2023

View reviewed changes

...sors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java Outdated Show resolved Hide resolved

Update plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervis…

2ee9274

…or/xenserver/resource/CitrixResourceBase.java

weizhouapache commented Aug 28, 2023

View reviewed changes

...sors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java Outdated Show resolved Hide resolved

Update plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervis…

d72745f

…or/xenserver/resource/CitrixResourceBase.java

weizhouapache changed the title ~~xen/xcpng: revert java changes in PR #4672~~ xen/xcpng: set vmr.VCPUsMax to minimum of global setting and host cpu cores Aug 28, 2023

weizhouapache removed the status:ready-for-sonar-check This PR is safe for Sonar Quality Check label Aug 28, 2023

weizhouapache marked this pull request as ready for review August 28, 2023 09:32

DaanHoogland approved these changes Aug 28, 2023

View reviewed changes

harikrishna-patnala approved these changes Aug 28, 2023

View reviewed changes

DaanHoogland merged commit 439d70f into apache:4.18 Aug 28, 2023

DaanHoogland deleted the 4.18-xcpng-revert-pr4672 branch August 28, 2023 12:26

DaanHoogland added a commit that referenced this pull request Aug 28, 2023

Merge release branch 4.18 to main

40d7da6

* 4.18: xen/xcpng: set vmr.VCPUsMax to minimum of global setting and host cpu cores (#7887)

xen/xcpng: set vmr.VCPUsMax to minimum of global setting and host cpu cores #7887

xen/xcpng: set vmr.VCPUsMax to minimum of global setting and host cpu cores #7887

Uh oh!

Conversation

weizhouapache commented Aug 21, 2023

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

weizhouapache commented Aug 21, 2023

Uh oh!

blueorangutan commented Aug 21, 2023

Uh oh!

blueorangutan commented Aug 21, 2023

Uh oh!

codecov bot commented Aug 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

weizhouapache commented Aug 21, 2023

Uh oh!

blueorangutan commented Aug 21, 2023

Uh oh!

weizhouapache commented Aug 21, 2023

Uh oh!

blueorangutan commented Aug 21, 2023

Uh oh!

weizhouapache commented Aug 21, 2023

Uh oh!

blueorangutan commented Aug 21, 2023

Uh oh!

blueorangutan commented Aug 22, 2023

Uh oh!

blueorangutan commented Aug 22, 2023

Uh oh!

weizhouapache commented Aug 22, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

Uh oh!

weizhouapache commented Aug 28, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

Uh oh!

Uh oh!

weizhouapache commented Aug 28, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

harikrishna-patnala left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

weizhouapache commented Aug 28, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

weizhouapache commented Aug 28, 2023

Uh oh!

weizhouapache commented Aug 28, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

DaanHoogland commented Aug 28, 2023

codecov bot commented Aug 21, 2023 •

edited

Loading

weizhouapache commented Aug 22, 2023 •

edited

Loading