Skip to content

Conversation

@weizhouapache
Copy link
Member

Description

This PR should fix #9897

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
  • test (unit or integration test code)

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?

How did you try to break this feature and the system with this change?

@weizhouapache
Copy link
Member Author

@blueorangutan package

@blueorangutan
Copy link

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

@codecov
Copy link

codecov bot commented Nov 6, 2024

Codecov Report

Attention: Patch coverage is 0% with 1 line in your changes missing coverage. Please review.

Project coverage is 15.80%. Comparing base (8af08dd) to head (11f7916).
Report is 200 commits behind head on 4.20.

Files with missing lines Patch % Lines
.../apache/cloudstack/backup/VeeamBackupProvider.java 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               4.20    #9898      +/-   ##
============================================
- Coverage     15.81%   15.80%   -0.01%     
  Complexity    12580    12580              
============================================
  Files          5627     5627              
  Lines        492260   492261       +1     
  Branches      63955    60364    -3591     
============================================
- Hits          77832    77825       -7     
- Misses       405905   405913       +8     
  Partials       8523     8523              
Flag Coverage Δ
uitests 4.04% <ø> (ø)
unittests 16.63% <0.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@weizhouapache
Copy link
Member Author

for existing backups without backed_volumes, do you have any idea how to proceed ?
@rohityadavcloud @Pearl1594

Copy link
Contributor

@Pearl1594 Pearl1594 left a comment

Choose a reason for hiding this comment

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

I actually think the actual issue is with the UI also - in case of historic backups where backup volume details is maintained on the vm (not backup):

https://github.com/apache/cloudstack/blob/main/ui/src/views/storage/RestoreAttachBackupVolume.vue#L130-L138

Where in here, it gets from the backups table alone.
The backend has the logic in place to pick from the backup volumes from the VMs if there's none on the backup -

List<Backup.VolumeInfo> backupVolumes = CollectionUtils.isNullOrEmpty(backup.getBackedUpVolumes()) ?
vm.getBackupVolumeList() : backup.getBackedUpVolumes();
List<VolumeVO> vmVolumes = volumeDao.findByInstance(vm.getId());

@weizhouapache
Copy link
Member Author

I actually think the actual issue is with the UI also - in case of historic backups where backup volume details is maintained on the vm (not backup):

https://github.com/apache/cloudstack/blob/main/ui/src/views/storage/RestoreAttachBackupVolume.vue#L130-L138

Where in here, it gets from the backups table alone. The backend has the logic in place to pick from the backup volumes from the VMs if there's none on the backup -

List<Backup.VolumeInfo> backupVolumes = CollectionUtils.isNullOrEmpty(backup.getBackedUpVolumes()) ?
vm.getBackupVolumeList() : backup.getBackedUpVolumes();
List<VolumeVO> vmVolumes = volumeDao.findByInstance(vm.getId());

OK, that's great !
therefore, yes, for existing backups, we need some UI changes 👍

@blueorangutan
Copy link

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

Copy link

@rajujith rajujith left a comment

Choose a reason for hiding this comment

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

LGTM
Backups list volumes.
Restore volume and attach works.

@weizhouapache weizhouapache changed the base branch from main to 4.20 November 27, 2024 19:53
@weizhouapache
Copy link
Member Author

@blueorangutan package

@blueorangutan
Copy link

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

@blueorangutan
Copy link

Packaging result [SF]: ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 11626

@blueorangutan
Copy link

Packaging result [SF]: ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 11629

@blueorangutan
Copy link

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

@weizhouapache
Copy link
Member Author

@blueorangutan test

@blueorangutan
Copy link

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

@blueorangutan
Copy link

[SF] Trillian Build Failed (tid-11813)

@weizhouapache
Copy link
Member Author

@blueorangutan package

@blueorangutan
Copy link

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

@blueorangutan
Copy link

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

@weizhouapache
Copy link
Member Author

@blueorangutan package

@blueorangutan
Copy link

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

@blueorangutan
Copy link

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

@weizhouapache
Copy link
Member Author

@blueorangutan test

@blueorangutan
Copy link

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

@blueorangutan
Copy link

[SF] Trillian Build Failed (tid-11825)

@DaanHoogland DaanHoogland added this to the 4.20.1 milestone Dec 10, 2024
@Pearl1594
Copy link
Contributor

@weizhouapache any update on this. Would this make it into 4.20.1?

@weizhouapache
Copy link
Member Author

LGTM Backups list volumes. Restore volume and attach works.

@Pearl1594
this has been tested by @rajujith
if code looks good, we can merge it

@weizhouapache weizhouapache marked this pull request as ready for review February 14, 2025 18:13
@Pearl1594
Copy link
Contributor

@blueorangutan package

@Pearl1594
Copy link
Contributor

Thanks @weizhouapache - will build packages. Once done, will merge.

@DaanHoogland
Copy link
Contributor

Blue ape only listens to last message
@blueorangutan package

@blueorangutan
Copy link

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

@blueorangutan
Copy link

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

@Pearl1594 Pearl1594 merged commit 21b5e4d into apache:4.20 Feb 18, 2025
24 of 25 checks passed
@DaanHoogland DaanHoogland deleted the 4.20-veeam-backed_volumes branch February 19, 2025 08:49
@Pearl1594 Pearl1594 moved this to Done in ACS 4.20.1 Mar 17, 2025
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Jun 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Veeam B&R : Restore and attach backup volume is not possible

5 participants