Fix ScaleVM to consider resize volume in any type of service offering #7359

harikrishna-patnala · 2023-03-23T04:17:16Z

Description

This PR fixes the issue #7325 where root disk is not getting considered for resize in some cases of ScaleVM operation.

While Scaling VM if the compute offering has the root disk size change (for any type of compute offering whether it is normal/constrained/unconstrained) CS should do the resize operation.

We already have a check here (

cloudstack/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

Lines 2102 to 2108 in 2149e82

    
           if (currentRootDiskOffering.getId() == newDiskOffering.getId() && 
        
                   (!newDiskOffering.isCustomized() || (newDiskOffering.isCustomized() && Objects.equals(rootVolumeOfVm.getSize(), rootDiskSizeBytes)))) { 
        
               if (s_logger.isDebugEnabled()) { 
        
                   s_logger.debug(String.format("Volume %s is already having disk offering %s", rootVolumeOfVm, newDiskOffering.getUuid())); 
        
               } 
        
               continue; 
        
           }

) whether to skip the disk offering change or not. So here in this PR I've removed the checks if the compute offering is customized or not which I think irrelavant for root disk resize.

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?

harikrishna-patnala · 2023-03-23T04:17:46Z

@blueorangutan package

blueorangutan · 2023-03-23T04:18:03Z

@harikrishna-patnala a Jenkins job has been kicked to build packages. It will be bundled with

SystemVM template(s). I'll keep you posted as I make progress.

blueorangutan · 2023-03-23T04:58:10Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5764

codecov · 2023-03-23T05:21:15Z

Codecov Report

Merging #7359 (e1c8b79) into 4.17 (dd51534) will decrease coverage by 0.01%.
The diff coverage is 0.00%.

@@             Coverage Diff              @@
##               4.17    #7359      +/-   ##
============================================
- Coverage     10.38%   10.38%   -0.01%     
+ Complexity     6651     6646       -5     
============================================
  Files          2453     2453              
  Lines        242444   242438       -6     
  Branches      37941    37938       -3     
============================================
- Hits          25168    25166       -2     
+ Misses       214159   214154       -5     
- Partials       3117     3118       +1

Impacted Files	Coverage Δ
...n/java/com/cloud/storage/VolumeApiServiceImpl.java	`10.76% <0.00%> (-0.20%)`	⬇️

... and 2 files with indirect coverage changes

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

DaanHoogland · 2023-03-23T07:57:21Z

@harikrishna-patnala should this be based of the 4.17 branch?

harikrishna-patnala · 2023-03-23T09:16:22Z

@blueorangutan package

blueorangutan · 2023-03-23T09:17:04Z

@harikrishna-patnala a Jenkins job has been kicked to build packages. It will be bundled with

SystemVM template(s). I'll keep you posted as I make progress.

blueorangutan · 2023-03-23T09:56:08Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5767

sonarqubecloud · 2023-03-23T10:10:41Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

0.0% Coverage
0.0% Duplication

github-advanced-security · 2023-03-23T12:22:02Z

You have successfully added a new SonarCloud configuration ``. As part of the setup process, we have scanned this repository and found no existing alerts. In the future, you will see all code scanning alerts on the repository Security tab.

server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java

harikrishna-patnala · 2023-03-24T04:23:52Z

@blueorangutan package

blueorangutan · 2023-03-24T04:25:03Z

@harikrishna-patnala a Jenkins job has been kicked to build packages. It will be bundled with

SystemVM template(s). I'll keep you posted as I make progress.

blueorangutan · 2023-03-24T04:58:07Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5773

harikrishna-patnala · 2023-03-24T05:55:10Z

@blueorangutan test

blueorangutan · 2023-03-24T05:56:03Z

@harikrishna-patnala a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

blueorangutan · 2023-03-24T17:27:51Z

Trillian test result (tid-6313)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 40191 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7359-t6313-kvm-centos7.zip
Smoke tests completed. 99 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_02_deploy_vm_with_extraconfig_kvm	`Error`	1.17	test_deploy_vm_extra_config_data.py
test_03_update_vm_with_extraconfig_kvm	`Error`	0.16	test_deploy_vm_extra_config_data.py
test_02_deploy_vm_on_specific_cluster	`Error`	1.14	test_vm_deployment_planner.py
test_03_deploy_vm_on_specific_pod	`Error`	1.17	test_vm_deployment_planner.py
test_04_deploy_vm_on_host_override_pod_and_cluster	`Error`	1.18	test_vm_deployment_planner.py
test_05_deploy_vm_on_cluster_override_pod	`Error`	1.13	test_vm_deployment_planner.py

harikrishna-patnala · 2023-03-27T05:55:01Z

@kiranchavala can you please test/review this ?

kiranchavala · 2023-03-27T07:52:05Z

@harikrishna-patnala Tested the PR, and the resize of root disk is working fine

Change the Global setting "allow.diskoffering.change.during.scale.vm " to true

Create a custom compute offering with a custom disk offering

Scenarios

Launched a vm a small offering
Stop the vm
scaled to a custom offering ( root disk resize worked fine)

Launched to custom offering
stop the vm
scaled to the same custom offering (root disk resize worked fine)

weizhouapache · 2023-03-27T08:35:48Z

@blueorangutan test

blueorangutan · 2023-03-27T08:36:03Z

@weizhouapache a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

blueorangutan · 2023-03-27T18:32:34Z

Trillian test result (tid-6324)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 34473 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7359-t6324-kvm-centos7.zip
Smoke tests completed. 99 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_02_deploy_vm_with_extraconfig_kvm	`Error`	1.15	test_deploy_vm_extra_config_data.py
test_03_update_vm_with_extraconfig_kvm	`Error`	1.13	test_deploy_vm_extra_config_data.py
test_02_deploy_vm_on_specific_cluster	`Error`	1.14	test_vm_deployment_planner.py
test_03_deploy_vm_on_specific_pod	`Error`	0.16	test_vm_deployment_planner.py
test_04_deploy_vm_on_host_override_pod_and_cluster	`Error`	1.16	test_vm_deployment_planner.py
test_05_deploy_vm_on_cluster_override_pod	`Error`	0.13	test_vm_deployment_planner.py

harikrishna-patnala · 2023-03-28T06:46:46Z

all these failed tests, report "errorText:Service offering is inactive: " but this seems unrelated to my changes.

Anyone else see these failures elsewhere ?

shwstppr · 2023-03-28T07:01:41Z

@harikrishna-patnala this seems an issue with 4.17 branch itself. I was seeing same failures here, #7313 (comment)

weizhouapache · 2023-03-28T07:37:57Z

@harikrishna-patnala this seems an issue with 4.17 branch itself. I was seeing same failures here, #7313 (comment)

@harikrishna-patnala @shwstppr
the issue has been fixed in 4.18/main by #7183 and #7190

I think you can ignore the test failures with 4.17

harikrishna-patnala · 2023-03-28T08:03:57Z

thanks @shwstppr and @weizhouapache

kiranchavala · 2023-03-29T05:44:14Z

@harikrishna-patnala

When a scale vm operation is performed in vmware 7. Resize of the root disk is failing on Vmare due to the following exception

com.cloud.utils.exception.CloudRuntimeException: Failed to resize volume operation of volume UUID: [c0e73278-3955-4981-91f6-0021dba430c1] due to - Failed to resize volume of VM [name: i-2-3-VM] due to: [Resize of volume in VM [name: i-2-3-VM] is not supported because Disk device [path: ROOT-3] has Parents: [6000C295-4f69-b62b-5d38-597886f37804].].

I have set vmware.create.full.clone to true

Could be related to #5992

Ignore the above exceptions

This issue is occurring without the PR changes

The PR LGTM

kiranchavala

Tested the feature and its working fine, LGTM

server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java

DaanHoogland

clgtm

weizhouapache

code lgtm

it fixes a valid bug

shwstppr · 2023-04-04T07:03:35Z

@blueorangutan package

blueorangutan · 2023-04-04T07:04:03Z

@shwstppr 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.

blueorangutan · 2023-04-04T08:02:40Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5848

shwstppr

LGTM

DaanHoogland · 2023-04-05T14:50:32Z

@harikrishna-patnala this gives conflicts on merging forward. Can you have a look please?

* 4.18: Fix ScaleVM to consider resize volume in any type of service offering (#7359)

boring-cyborg bot added the component:storage label Mar 23, 2023

harikrishna-patnala changed the base branch from main to 4.17 March 23, 2023 08:59

boring-cyborg bot added component:agent component:build component:integration labels Mar 23, 2023

Fix ScaleVM to consider resize volume in any type of compute offering

7b5cafa

harikrishna-patnala force-pushed the scaleVMfix branch from 140914e to 7b5cafa Compare March 23, 2023 09:16

DaanHoogland reviewed Mar 23, 2023

View reviewed changes

server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java Show resolved Hide resolved

Reformat code

99a54e9

harikrishna-patnala requested review from nvazquez and weizhouapache March 27, 2023 05:50

kiranchavala approved these changes Mar 29, 2023

View reviewed changes

DaanHoogland reviewed Mar 29, 2023

View reviewed changes

server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java Outdated Show resolved Hide resolved

Addressed review comment

e1c8b79

harikrishna-patnala requested a review from DaanHoogland March 31, 2023 05:33

DaanHoogland approved these changes Mar 31, 2023

View reviewed changes

weizhouapache approved these changes Mar 31, 2023

View reviewed changes

apache deleted a comment from blueorangutan Apr 3, 2023

apache deleted a comment from blueorangutan Apr 4, 2023

shwstppr approved these changes Apr 4, 2023

View reviewed changes

DaanHoogland merged commit b2f1965 into apache:4.17 Apr 5, 2023

DaanHoogland deleted the scaleVMfix branch April 5, 2023 14:21

DaanHoogland added a commit that referenced this pull request Apr 5, 2023

Merge release branch 4.18 to main

b7bd996

* 4.18: Fix ScaleVM to consider resize volume in any type of service offering (#7359)

shwstppr mentioned this pull request Apr 6, 2023

New rootdisksize not set with Scale instance in 4.17.2 #7325

Closed

weizhouapache added this to the 4.18.1.0 milestone May 5, 2023

	if (currentRootDiskOffering.getId() == newDiskOffering.getId() &&
	(!newDiskOffering.isCustomized() \|\| (newDiskOffering.isCustomized() && Objects.equals(rootVolumeOfVm.getSize(), rootDiskSizeBytes)))) {
	if (s_logger.isDebugEnabled()) {
	s_logger.debug(String.format("Volume %s is already having disk offering %s", rootVolumeOfVm, newDiskOffering.getUuid()));
	}
	continue;
	}

Fix ScaleVM to consider resize volume in any type of service offering #7359

Fix ScaleVM to consider resize volume in any type of service offering #7359

Uh oh!

Conversation

harikrishna-patnala commented Mar 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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!

harikrishna-patnala commented Mar 23, 2023

Uh oh!

blueorangutan commented Mar 23, 2023

Uh oh!

blueorangutan commented Mar 23, 2023

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

DaanHoogland commented Mar 23, 2023

Uh oh!

harikrishna-patnala commented Mar 23, 2023

Uh oh!

blueorangutan commented Mar 23, 2023

Uh oh!

blueorangutan commented Mar 23, 2023

Uh oh!

sonarqubecloud bot commented Mar 23, 2023

Uh oh!

github-advanced-security bot commented Mar 23, 2023

Uh oh!

Uh oh!

harikrishna-patnala commented Mar 24, 2023

Uh oh!

blueorangutan commented Mar 24, 2023

Uh oh!

blueorangutan commented Mar 24, 2023

Uh oh!

harikrishna-patnala commented Mar 24, 2023

Uh oh!

blueorangutan commented Mar 24, 2023

Uh oh!

blueorangutan commented Mar 24, 2023

Uh oh!

harikrishna-patnala commented Mar 27, 2023

Uh oh!

kiranchavala commented Mar 27, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

weizhouapache commented Mar 27, 2023

Uh oh!

blueorangutan commented Mar 27, 2023

Uh oh!

blueorangutan commented Mar 27, 2023

Uh oh!

harikrishna-patnala commented Mar 28, 2023

Uh oh!

shwstppr commented Mar 28, 2023

Uh oh!

weizhouapache commented Mar 28, 2023

Uh oh!

harikrishna-patnala commented Mar 28, 2023

Uh oh!

kiranchavala commented Mar 29, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kiranchavala left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

harikrishna-patnala commented Mar 23, 2023 •

edited

Loading

codecov bot commented Mar 23, 2023 •

edited

Loading

kiranchavala commented Mar 27, 2023 •

edited

Loading

kiranchavala commented Mar 29, 2023 •

edited

Loading