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.

Sign up for GitHub

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

feat(backups): add settings to force snapshotting during VM backup #6221

Merged
merged 6 commits into from
May 17, 2022
Merged

feat(backups): add settings to force snapshotting during VM backup #6221

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1eb0a48
feat(backups): add a setting `unconditionalSnapshot` to force a snaps…
fbeauchamp May 6, 2022
7f7c34f
add more details in changelog
fbeauchamp May 13, 2022
d937f1e
reorder conditions and remove uneeded comment
fbeauchamp May 17, 2022
8bb2c5f
fix: add unconditionalSnapshot settings to proxy.toml
fbeauchamp May 17, 2022
a97ab14
Update CHANGELOG.unreleased.md
fbeauchamp May 17, 2022
490facf
Merge branch 'master' into feat_force_offline_snapshot
julien-f May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion @xen-orchestra/backups/_VmBackup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,11 @@ class VmBackup {
const settings = this._settings

const doSnapshot =
this._isDelta || (!settings.offlineBackup && vm.power_state === 'Running') || settings.snapshotRetention !== 0
this._isDelta ||
(!settings.offlineBackup && vm.power_state === 'Running') ||
settings.snapshotRetention !== 0 ||
// https://help.vates.fr/#ticket/zoom/6735
settings.unconditionalSnapshot
julien-f marked this conversation as resolved.
Show resolved Hide resolved
if (doSnapshot) {
await Task.run({ name: 'snapshot' }, async () => {
if (!settings.bypassVdiChainsCheck) {
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

> Users must be able to say: “Nice enhancement, I'm eager to test it”

- [Backup] add a setting `unconditionalSnapshot` to force a snapshot even when the VM is halted (PR [#6221](https://github.com/vatesfr/xen-orchestra/pull/6221))
julien-f marked this conversation as resolved.
Show resolved Hide resolved

### Bug fixes

> Users must be able to say: “I had this issue, happy to know it's fixed”
Expand All @@ -33,5 +35,4 @@

<!--packages-start-->


<!--packages-end-->
1 change: 1 addition & 0 deletions packages/xo-server/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ offlineSnapshot = false
snapshotRetention = 0
timeout = 0
vmTimeout = 0
unconditionalSnapshot = false
julien-f marked this conversation as resolved.
Show resolved Hide resolved

# This is a work-around.
#
Expand Down