Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix VM snapshot size during storage capacity check #8101

Merged
merged 1 commit into from Oct 18, 2023

Conversation

harikrishna-patnala
Copy link
Contributor

@harikrishna-patnala harikrishna-patnala commented Oct 16, 2023

Description

This PR fixes the issue #8054

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)
  • build/CI

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

How Has This Been Tested?

  1. created a VM with one root (2GB) and data (5GB) disks

  2. create VM snapshot and the primary storage usage looks like below
    image

  3. After this is fixed, usage considered 5GB data disk size as well
    image

@harikrishna-patnala
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

@harikrishna-patnala 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.

@codecov
Copy link

codecov bot commented Oct 16, 2023

Codecov Report

Merging #8101 (050ca00) into 4.18 (fb3a2ec) will decrease coverage by 0.01%.
Report is 2 commits behind head on 4.18.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               4.18    #8101      +/-   ##
============================================
- Coverage     13.07%   13.06%   -0.01%     
- Complexity     9108     9109       +1     
============================================
  Files          2720     2720              
  Lines        257528   257524       -4     
  Branches      40153    40150       -3     
============================================
- Hits          33659    33654       -5     
- Misses       219639   219643       +4     
+ Partials       4230     4227       -3     
Files Coverage Δ
...main/java/com/cloud/storage/dao/VolumeDaoImpl.java 23.11% <ø> (-0.13%) ⬇️

... and 2 files with indirect coverage changes

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

Copy link
Member

@rohityadavcloud rohityadavcloud left a comment

Choose a reason for hiding this comment

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

LGTM - didn't test it though

@DaanHoogland
Copy link
Contributor

@blueorangutan test

Copy link
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

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

less == more, needs testing though

Copy link
Contributor

@shwstppr shwstppr left a comment

Choose a reason for hiding this comment

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

Code LGTM

@shwstppr
Copy link
Contributor

@blueorangutan package

@blueorangutan
Copy link

@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

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

@rohityadavcloud
Copy link
Member

@blueorangutan test

@blueorangutan
Copy link

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

@DaanHoogland
Copy link
Contributor

tested manually according to description, works as expected

@DaanHoogland DaanHoogland merged commit 0183e25 into apache:4.18 Oct 18, 2023
24 of 26 checks passed
@blueorangutan
Copy link

[SF] Trillian test result (tid-7995)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 46173 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8101-t7995-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_upgrade_kubernetes_cluster Failure 580.25 test_kubernetes_clusters.py
test_04_autoscale_kubernetes_cluster Failure 48.23 test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster Failure 3609.51 test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster Failure 0.05 test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster Failure 0.04 test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown Error 283.85 test_kubernetes_clusters.py
test_03_deploy_vm_wrong_checksum Error 39.60 test_templates.py
test_09_list_templates_download_details Failure 0.04 test_templates.py

@DaanHoogland DaanHoogland deleted the VMsnapshotSize branch October 19, 2023 07:33
@DaanHoogland DaanHoogland removed their assignment Nov 16, 2023
shwstppr pushed a commit to shapeblue/cloudstack that referenced this pull request Dec 27, 2023
(cherry picked from commit 0183e25)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
rohityadavcloud pushed a commit to shapeblue/cloudstack that referenced this pull request Mar 31, 2024
(cherry picked from commit 0183e25)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
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.

None yet

5 participants