NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(xo-server/vm.stop): add forceShutdownDelay (#7247)

Browse Source
This commit is contained in:
b-Nollet 2023-12-22 09:13:36 +01:00 committed by GitHub
parent 4c775f6b86
commit d38dce9302
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/xo-server/src/api/vm.mjs
View File

@ -11,7 +11,7 @@ import { defer } from 'golike-defer'
import { format } from 'json-rpc-peer'
import { FAIL_ON_QUEUE } from 'limit-concurrency-decorator'
import { getStreamAsBuffer } from 'get-stream'
import { ignoreErrors } from 'promise-toolbox'
import { ignoreErrors, timeout } from 'promise-toolbox'
import { invalidParameters, noSuchObject, unauthorized } from 'xo-common/api-errors.js'
import { Ref } from 'xen-api'
@ -1027,11 +1027,7 @@ start.resolve = {
// -------------------------------------------------------------------
// TODO: implements timeout.
// - if !force → clean shutdown
// - if force is true → hard shutdown
// - if force is integer → clean shutdown and after force seconds, hard shutdown.
export const stop = defer(async function ($defer, { vm, force, bypassBlockedOperation = force }) {
export const stop = defer(async function ($defer, { vm, force, forceShutdownDelay, bypassBlockedOperation = force }) {
const xapi = this.getXapi(vm)
if (bypassBlockedOperation) {
@ -1053,13 +1049,14 @@ export const stop = defer(async function ($defer, { vm, force, bypassBlockedOper
// Clean shutdown
try {
await xapi.shutdownVm(vm._xapiRef)
await timeout.call(xapi.shutdownVm(vm._xapiRef), forceShutdownDelay, () =>
xapi.shutdownVm(vm._xapiRef, { hard: true })
)
} catch (error) {
const { code } = error
if (code === 'VM_MISSING_PV_DRIVERS' || code === 'VM_LACKS_FEATURE_SHUTDOWN') {
throw invalidParameters('clean shutdown requires PV drivers')
}
throw error
}
})
@ -1067,6 +1064,7 @@ export const stop = defer(async function ($defer, { vm, force, bypassBlockedOper
stop.params = {
id: { type: 'string' },
force: { type: 'boolean', optional: true },
forceShutdownDelay: { type: 'number', default: 0 },
bypassBlockedOperation: { type: 'boolean', optional: true },
}