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

Fix Xen error handling (#56).

Browse Source
This commit is contained in:
Julien Fontanet 2015-05-05 10:24:13 +02:00
parent bcc2244fdb
commit f0b0277b9d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/sr.js
View File

@ -259,11 +259,11 @@ export const probeNfs = coroutine(function ({
throw new Error('the call above should have thrown an error') throw new Error('the call above should have thrown an error')
} catch (error) { } catch (error) {
if (error[0] !== 'SR_BACKEND_FAILURE_101') { if (error.code !== 'SR_BACKEND_FAILURE_101') {
throw error throw error
} }
xml = parseXml(error[3]) xml = parseXml(error.params[2])
} }
const nfsExports = [] const nfsExports = []
@ -396,14 +396,14 @@ export const probeIscsiIqns = coroutine(function ({
throw new Error('the call above should have thrown an error') throw new Error('the call above should have thrown an error')
} catch (error) { } catch (error) {
if (error[0] === 'SR_BACKEND_FAILURE_141') { if (error.code === 'SR_BACKEND_FAILURE_141') {
return [] return []
} }
if (error[0] !== 'SR_BACKEND_FAILURE_96') { if (error.code !== 'SR_BACKEND_FAILURE_96') {
throw error throw error
} }
xml = parseXml(error[3]) xml = parseXml(error.params[2])
} }
const targets = [] const targets = []
@ -474,11 +474,11 @@ export const probeIscsiLuns = coroutine(function ({
throw new Error('the call above should have thrown an error') throw new Error('the call above should have thrown an error')
} catch (error) { } catch (error) {
if (error[0] !== 'SR_BACKEND_FAILURE_107') { if (error.code !== 'SR_BACKEND_FAILURE_107') {
throw error throw error
} }
xml = parseXml(error[3]) xml = parseXml(error.params[2])
} }
const luns = [] const luns = []

2
src/api/vm.coffee
View File

@ -706,7 +706,7 @@ stop = $coroutine ({vm, force}) ->
try try
$wait xapi.call 'VM.clean_shutdown', vm.ref $wait xapi.call 'VM.clean_shutdown', vm.ref
catch error catch error
if error[0] is 'VM_MISSING_PV_DRIVERS' if error.code is 'VM_MISSING_PV_DRIVERS'
# TODO: Improve reporting: this message is unclear. # TODO: Improve reporting: this message is unclear.
@throw 'INVALID_PARAMS' @throw 'INVALID_PARAMS'
else else