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

Create new Instance from VM backup #10140

Draft
wants to merge 66 commits into
base: main
Choose a base branch
from

Conversation

abh1sar
Copy link
Collaborator

@abh1sar abh1sar commented Dec 25, 2024

Doc PR: apache/cloudstack-documentation#474

Description

This PR adds the ability to create a new Instance from a VM backup for Dummy, NAS and Veeam backup Providers.
This will still work if the original Instance used to create the backup was expunged.

New API

  • createVmFromBackup extends deployVIrtualMachine
  • new argument : backupId
  • User can just specify the backupId and a new instance will be created by getting the VM and volumes' configuration stored in backup_details table.
  • User can also choose to configure the details themselves using the parameters present in deployVIrtualMachine cmd

UI

  • New action button in backups list view - 'Create Instance from Backup'
  • User can choose to directly create the VM or configure VM parameters before creating it.

DB changes

  • New backup_details table
  • to store vm config data such as templateUuid, serviceOfferingUuid, hypervisor, networkUuids
  • to store volumes config data such as diskOfferingUuids, size, miniops and maxiops for custom disk offerings.

Other Changes

  • Added new parameter Map datadisksdetails to deployVirtualMachine api to create multiple data volumes at the time of instance creation.

Plugins related changes

  • NAS and Veeam plugin changes to restore backup to a new VM.

Other Miscellaneous changes

  1. Add Name and description column to backup
  2. Show Interval type in UI for backups
  3. Support cephFS for NAS backup provider
  4. Add Backup Storage Capacity Tracking and Alerts Infrastructure
    Backup Storage (used and available) is shown on the Capacity dashboard and tracks the alerts if supported by the plugin
    (Currently only NAS BnR plugin supports it)
  5. Add Object Storage Capacity Tracking and Alerts Infrastructure
    Object Storage (allocated and available) is shown on the Capacity dashboard and tracked for alerts.

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

Screenshot 2025-01-14 at 2 17 16 PM Screenshot 2025-01-14 at 2 17 35 PM

How Has This Been Tested?

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

Copy link

codecov bot commented Dec 25, 2024

Codecov Report

Attention: Patch coverage is 35.21001% with 725 lines in your changes missing coverage. Please review.

Project coverage is 16.38%. Comparing base (d94aaa8) to head (1574f3a).
Report is 7 commits behind head on main.

Files with missing lines Patch % Lines
.../src/main/java/com/cloud/vm/UserVmManagerImpl.java 33.48% 114 Missing and 31 partials ⚠️
...rg/apache/cloudstack/backup/BackupManagerImpl.java 68.36% 36 Missing and 26 partials ⚠️
...ack/api/command/user/vm/CreateVMFromBackupCmd.java 3.57% 54 Missing ⚠️
...rg/apache/cloudstack/backup/dao/BackupDaoImpl.java 40.98% 30 Missing and 6 partials ⚠️
...a/org/apache/cloudstack/backup/BackupDetailVO.java 18.91% 29 Missing and 1 partial ⚠️
.../apache/cloudstack/backup/DummyBackupProvider.java 0.00% 29 Missing ⚠️
...rg/apache/cloudstack/backup/NASBackupProvider.java 60.31% 21 Missing and 4 partials ⚠️
...apache/cloudstack/api/response/BackupResponse.java 23.33% 23 Missing ⚠️
...che/cloudstack/backup/NetworkerBackupProvider.java 0.00% 23 Missing ⚠️
...loudstack/backup/GetBackupStorageStatsCommand.java 18.51% 22 Missing ⚠️
... and 32 more
Additional details and impacted files
@@             Coverage Diff              @@
##               main   #10140      +/-   ##
============================================
+ Coverage     16.26%   16.38%   +0.12%     
- Complexity    13387    13518     +131     
============================================
  Files          5674     5683       +9     
  Lines        498927   500912    +1985     
  Branches      60337    60687     +350     
============================================
+ Hits          81155    82093     +938     
- Misses       408732   409627     +895     
- Partials       9040     9192     +152     
Flag Coverage Δ
uitests 3.88% <ø> (-0.12%) ⬇️
unittests 17.28% <35.21%> (+0.16%) ⬆️

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.

🚀 New features to boost your workflow:
  • Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@leo79901
Copy link

Yes, we need this !

@abh1sar
Copy link
Collaborator Author

abh1sar commented Jan 6, 2025

@blueorangutan package

@blueorangutan
Copy link

@abh1sar 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 11996

Copy link

github-actions bot commented Jan 8, 2025

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

@rohityadavcloud rohityadavcloud added this to the 4.21.0 milestone Mar 4, 2025
Copy link

github-actions bot commented Mar 6, 2025

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

Copy link

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

@abh1sar
Copy link
Collaborator Author

abh1sar commented Mar 11, 2025

@blueorangutan package

@blueorangutan
Copy link

@abh1sar 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 12734

@@ -0,0 +1,150 @@
package org.apache.cloudstack.backup.dao;
Copy link
Contributor

Choose a reason for hiding this comment

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

license

Assert.assertEquals("test-offering", response.getBackupOffering());
Assert.assertEquals("MANUAL", response.getIntervalType());
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

eol before eof

Comment on lines +2352 to +2362
if (vm.getBackupOfferingId() != null) {
List<Backup> backupsForVm = backupDao.listByVmId(vm.getDataCenterId(), vm.getId());
if (CollectionUtils.isEmpty(backupsForVm)) {
backupManager.removeVMFromBackupOffering(vm.getId(), true);
} else {
throw new CloudRuntimeException(String.format("This VM [uuid: %s, name: %s] has a "
+ "Backup Offering [id: %s, external id: %s] with %s backups. Please, remove the backup offering "
+ "before proceeding to VM exclusion!", vm.getUuid(), vm.getInstanceName(), vm.getBackupOfferingId(),
vm.getBackupExternalId(), backupsForVm.size()));
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

extract method?

@abh1sar
Copy link
Collaborator Author

abh1sar commented Mar 11, 2025

@blueorangutan package

@blueorangutan
Copy link

@abh1sar 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 12737

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.

6 participants