@xen-orchestra/backups 0.55.0 → 0.57.0
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.
|
@@ -74,9 +74,12 @@ export const Abstract = class AbstractVmBackupRunner {
|
|
|
74
74
|
|
|
75
75
|
// check if current VM has tags
|
|
76
76
|
const tags = this._tags
|
|
77
|
-
const intersect = settings.healthCheckVmsWithTags.some(t => tags.includes(t))
|
|
78
77
|
|
|
79
|
-
|
|
78
|
+
// accept both 'xo:no-health-check' and 'xo:no-health-check=reason'
|
|
79
|
+
const vmAlwaysIgnored = tags.some(t => t.startsWith('xo:no-health-check'))
|
|
80
|
+
const intersect = !vmAlwaysIgnored && settings.healthCheckVmsWithTags.some(t => tags.includes(t))
|
|
81
|
+
|
|
82
|
+
if (vmAlwaysIgnored || (settings.healthCheckVmsWithTags.length !== 0 && !intersect)) {
|
|
80
83
|
// create a task to have an info in the logs and reports
|
|
81
84
|
return Task.run(
|
|
82
85
|
{
|
|
@@ -150,7 +150,7 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
|
|
|
150
150
|
try {
|
|
151
151
|
// enable CBT on all disks if possible
|
|
152
152
|
const diskRefs = await xapi.VM_getDisks(vm.$ref)
|
|
153
|
-
await Promise.all(diskRefs.map(diskRef => xapi.
|
|
153
|
+
await Promise.all(diskRefs.map(diskRef => xapi.callAsync('VDI.enable_cbt', diskRef)))
|
|
154
154
|
} catch (error) {
|
|
155
155
|
Task.info(`couldn't enable CBT`, error)
|
|
156
156
|
}
|
|
@@ -58,8 +58,8 @@ export const MixinRemoteWriter = (BaseClass = Object) =>
|
|
|
58
58
|
const { disableMergeWorker } = this._config
|
|
59
59
|
// merge worker only compatible with local remotes
|
|
60
60
|
const { handler } = this._adapter
|
|
61
|
-
const
|
|
62
|
-
|
|
61
|
+
const synchronousMerge = this._settings.mergeBackupsSynchronously
|
|
62
|
+
const willMergeInWorker = !synchronousMerge && !disableMergeWorker && typeof handler.getRealPath === 'function'
|
|
63
63
|
const { merge } = await this._cleanVm({ remove: true, merge: !willMergeInWorker })
|
|
64
64
|
await this.#lock.dispose()
|
|
65
65
|
|
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.
|
|
11
|
+
"version": "0.57.0",
|
|
12
12
|
"engines": {
|
|
13
13
|
"node": ">=14.18"
|
|
14
14
|
},
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"uuid": "^9.0.0",
|
|
50
50
|
"value-matcher": "^0.2.0",
|
|
51
51
|
"vhd-lib": "^4.11.2",
|
|
52
|
-
"xen-api": "^4.
|
|
52
|
+
"xen-api": "^4.7.0",
|
|
53
53
|
"yazl": "^2.5.1"
|
|
54
54
|
},
|
|
55
55
|
"devDependencies": {
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"tmp": "^0.2.1"
|
|
60
60
|
},
|
|
61
61
|
"peerDependencies": {
|
|
62
|
-
"@xen-orchestra/xapi": "^7.
|
|
62
|
+
"@xen-orchestra/xapi": "^7.9.0"
|
|
63
63
|
},
|
|
64
64
|
"license": "AGPL-3.0-or-later",
|
|
65
65
|
"author": {
|