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

Jump to bottom

fix(backups): really delete vhd/xva when deleting backups #6081

Merged
merged 3 commits into from
Jan 19, 2022
Merged

fix(backups): really delete vhd/xva when deleting backups #6081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56ad2b7
fix(backups): use handler.unlink for deleting metadat instead of VhdA…
fbeauchamp Jan 12, 2022
eca635d
feat(xo-web): delete all the backups at once and let xo-server handle…
fbeauchamp Jan 12, 2022
29aeb35
feat(backups): execute cleanup on each related vm dir after a backup …
fbeauchamp Jan 12, 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
10 changes: 8 additions & 2 deletions @xen-orchestra/backups/RemoteAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ class RemoteAdapter {
async deleteDeltaVmBackups(backups) {
const handler = this._handler

// unused VHDs will be detected by `cleanVm`
await asyncMapSettled(backups, ({ _filename }) => VhdAbstract.unlink(handler, _filename))
// this will delete the json, unused VHDs will be detected by `cleanVm`
await asyncMapSettled(backups, ({ _filename }) => handler.unlink(_filename))
}

async deleteMetadataBackup(backupId) {
Expand Down Expand Up @@ -277,6 +277,12 @@ class RemoteAdapter {
delta !== undefined && this.deleteDeltaVmBackups(delta),
full !== undefined && this.deleteFullVmBackups(full),
])

const dirs = new Set(files.map(file => dirname(file)))
for (const dir of dirs) {
// don't merge in main process, unused VHDs will be merged in the next backup run
await this.cleanVm(dir, { remove: true, onLog: warn })
}
}

#getCompressionType() {
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
- [Backup] Detect and clear orphan merge states, fix `ENOENT` errors (PR [#6087](https://github.com/vatesfr/xen-orchestra/pull/6087))
- [Backup] Ensure merges are also executed after backup on S3, maintaining the size of the VHD chain under control [Forum#45743](https://xcp-ng.org/forum/post/45743) (PR [#6095](https://github.com/vatesfr/xen-orchestra/pull/6095))
- [Backup] Delete backups immediately instead of waiting for the next backup (PR [#6081](https://github.com/vatesfr/xen-orchestra/pull/6081))

### Packages to release

Expand Down
8 changes: 1 addition & 7 deletions packages/xo-web/src/common/xo/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2227,13 +2227,7 @@ export const restoreBackup = (backup, sr, { generateNewMacAddresses = false, sta

export const deleteBackup = backup => _call('backupNg.deleteVmBackup', { id: resolveId(backup) })

export const deleteBackups = async backups => {
// delete sequentially from newest to oldest
backups = backups.slice().sort((b1, b2) => b2.timestamp - b1.timestamp)
for (let i = 0, n = backups.length; i < n; ++i) {
await deleteBackup(backups[i])
}
}
export const deleteBackups = async backups => _call('backupNg.deleteVmBackups', { ids: backups.map(backup => resolveId(backup)) })

export const createMetadataBackupJob = props =>
_call('metadataBackup.createJob', props)
Expand Down