From c304d9cc62c28fee7215adfd2ca4554c68163044 Mon Sep 17 00:00:00 2001 From: Fabrice Marsaud Date: Wed, 20 Jan 2016 09:36:38 +0100 Subject: [PATCH] No vdi merge through smb --- src/api/vm.coffee | 2 ++ src/xo-mixins/backups.js | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/api/vm.coffee b/src/api/vm.coffee index 459bd585d..6a05aa3d5 100644 --- a/src/api/vm.coffee +++ b/src/api/vm.coffee @@ -498,6 +498,8 @@ rollingDeltaBackup = $coroutine ({vm, remote, tag, depth}) -> throw new Error "No such Remote #{remote}" if not _remote.enabled throw new Error "Backup remote #{remote} is disabled" + if _remote.type == 'smb' + throw new Error "Delta Backup is not supported for smb remotes" return yield @rollingDeltaVmBackup({ vm, remoteId: remote, diff --git a/src/xo-mixins/backups.js b/src/xo-mixins/backups.js index f98b1f56f..93a7a9d7f 100644 --- a/src/xo-mixins/backups.js +++ b/src/xo-mixins/backups.js @@ -267,6 +267,9 @@ export default class { } async _mergeDeltaVdiBackups ({remote, dir, depth}) { + if (remote.type === 'smb') { + throw new Error('VDI merging is not available through SMB') + } const backups = await this._listVdiBackups(remote, dir) let i = backups.length - depth