Skip to content

engine-orchestration: fix volume size resource count mismatch - #7666

Merged
yadvr merged 1 commit into
apache:4.18from
shapeblue:fix-negative-storage
Jul 3, 2023
Merged

yadvr merged 1 commit into
apache:4.18from
shapeblue:fix-negative-storage

Conversation

@shwstppr

Copy link
Copy Markdown
Contributor

Description

Fixes case of account/domain having negative storage count when there is a volume size difference while deploying volumes on certain stroages. In case of Powerflex volume size results in a multiple of 8. If user deploys a volume of 12GB it will result in 16GB in size. But currently CloudStack will not update resource count after deployment.

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

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

Fixes case of account/domain having negative storage count when there is a volume size difference while deploying volumes on certain stroages. In case of Powerflex volume size results in a multiple of 8. If user deploys a volume of 12GB it will result in 16GB in size. But currently CloudStack will not update resource count after deployment.

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

fixes

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

revert ResourceCountCheckTask changes

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
@codecov

codecov Bot commented Jun 21, 2023

Copy link
Copy Markdown

Codecov Report

Merging #7666 (0044058) into 4.18 (1aa4f80) will increase coverage by 0.03%.
The diff coverage is 84.61%.

@@             Coverage Diff              @@
##               4.18    #7666      +/-   ##
============================================
+ Coverage     12.98%   13.02%   +0.03%     
- Complexity     8989     9017      +28     
============================================
  Files          2716     2716              
  Lines        256343   256668     +325     
  Branches      39981    40023      +42     
============================================
+ Hits          33291    33432     +141     
- Misses       218886   219050     +164     
- Partials       4166     4186      +20     
Impacted Files Coverage Δ
...stack/engine/orchestration/VolumeOrchestrator.java 1.91% <84.61%> (+1.91%) ⬆️

... and 14 files with indirect coverage changes

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

@shwstppr

Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

Copy link
Copy Markdown

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

@shwstppr

Copy link
Copy Markdown
Contributor Author

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

[SF] Trillian test result (tid-6803)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 48170 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7666-t6803-kvm-centos7.zip
Smoke tests completed. 106 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_list_cpvm_vm Failure 0.03 test_ssvm.py
test_04_cpvm_internals Failure 0.06 test_ssvm.py
test_01_migrate_VM_and_root_volume Error 76.71 test_vm_life_cycle.py
test_02_migrate_VM_with_two_data_disks Error 52.40 test_vm_life_cycle.py

@shwstppr
shwstppr requested a review from nvazquez June 26, 2023 06:51

@yadvr yadvr left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code LGTM didn't test it though

@blueorangutan

Copy link
Copy Markdown

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

@borisstoyanov borisstoyanov left a comment •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Managed to reproduce with nightly packages for 4.18:
Screenshot 2023-06-28 at 12 34 39
Screenshot 2023-06-28 at 13 04 23

Then upgraded to this PR and got the expected behaviour:
Screenshot 2023-06-28 at 13 55 46

Screenshot 2023-06-28 at 13 58 34

LGTM

@yadvr
yadvr marked this pull request as ready for review June 28, 2023 11:53
@yadvr

yadvr commented Jun 29, 2023

Copy link
Copy Markdown
Member

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

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

Test Result Time (s) Test File
test_08_upgrade_kubernetes_ha_cluster Failure 1040.23 test_kubernetes_clusters.py
test_01_migrate_VM_and_root_volume Error 78.77 test_vm_life_cycle.py
test_02_migrate_VM_with_two_data_disks Error 55.46 test_vm_life_cycle.py

@yadvr

yadvr commented Jul 3, 2023

Copy link
Copy Markdown
Member

Intermittent failures same as in #7345 merging this

@yadvr
yadvr merged commit 31dbdd0 into apache:4.18 Jul 3, 2023
@yadvr
yadvr deleted the fix-negative-storage branch July 3, 2023 07:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants