@xen-orchestra/backups 0.48.0 → 0.48.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -240,6 +240,18 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
|
|
|
240
240
|
})
|
|
241
241
|
}, 'writer.beforeBackup()')
|
|
242
242
|
|
|
243
|
+
const vm = this._vm
|
|
244
|
+
|
|
245
|
+
// block migration during the backup on the VM itself, not the latest snapshot
|
|
246
|
+
{
|
|
247
|
+
const { pool_migrate = null, migrate_send = null } = vm.blocked_operations
|
|
248
|
+
|
|
249
|
+
const reason = 'VM migration is blocked during backup'
|
|
250
|
+
await vm.update_blocked_operations({ pool_migrate: reason, migrate_send: reason })
|
|
251
|
+
|
|
252
|
+
$defer(() => vm.update_blocked_operations({ pool_migrate, migrate_send }))
|
|
253
|
+
}
|
|
254
|
+
|
|
243
255
|
await this._fetchJobSnapshots()
|
|
244
256
|
|
|
245
257
|
await this._selectBaseVm()
|
|
@@ -247,7 +259,6 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
|
|
|
247
259
|
await this._cleanMetadata()
|
|
248
260
|
await this._removeUnusedSnapshots()
|
|
249
261
|
|
|
250
|
-
const vm = this._vm
|
|
251
262
|
const isRunning = vm.power_state === 'Running'
|
|
252
263
|
const startAfter = isRunning && (settings.offlineBackup ? 'backup' : settings.offlineSnapshot && 'snapshot')
|
|
253
264
|
if (startAfter) {
|
|
@@ -261,15 +272,7 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
|
|
|
261
272
|
}
|
|
262
273
|
|
|
263
274
|
if (this._writers.size !== 0) {
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
const reason = 'VM migration is blocked during backup'
|
|
267
|
-
await this._exportedVm.update_blocked_operations({ pool_migrate: reason, migrate_send: reason })
|
|
268
|
-
try {
|
|
269
|
-
await this._copy()
|
|
270
|
-
} finally {
|
|
271
|
-
await this._exportedVm.update_blocked_operations({ pool_migrate, migrate_send })
|
|
272
|
-
}
|
|
275
|
+
await this._copy()
|
|
273
276
|
}
|
|
274
277
|
} finally {
|
|
275
278
|
if (startAfter) {
|
package/package.json
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"type": "git",
|
|
9
9
|
"url": "https://github.com/vatesfr/xen-orchestra.git"
|
|
10
10
|
},
|
|
11
|
-
"version": "0.48.
|
|
11
|
+
"version": "0.48.1",
|
|
12
12
|
"engines": {
|
|
13
13
|
"node": ">=14.18"
|
|
14
14
|
},
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"tar": "^6.1.15",
|
|
48
48
|
"uuid": "^9.0.0",
|
|
49
49
|
"vhd-lib": "^4.9.2",
|
|
50
|
-
"xen-api": "^3.0.
|
|
50
|
+
"xen-api": "^3.0.1",
|
|
51
51
|
"yazl": "^2.5.1"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|