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

Better handling of transport call retries.

Browse Source
This commit is contained in:
Julien Fontanet 2015-04-15 18:23:49 +02:00
parent 91d36122eb
commit 3aae60bde9
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
packages/xen-api/src/index.js
View File

@ -110,7 +110,6 @@ export class Xapi extends EventEmitter {
this._auth = opts.auth
this._sessionId = notConnectedPromise
this._tries = 0
this._init()
@ -234,9 +233,41 @@ export class Xapi extends EventEmitter {
}
// Low level call: handle transport errors.
_transportCall (method, args) {
_transportCall (method, args, tries = 1) {
debug('%s: %s(...)', this._humanId, method)
return this._rawCall(method, args)
.catch(isNetworkError, isXapiNetworkError, error => {
debug('%s: network error %s', this._humanId, error.code)
if (!(tries < MAX_TRIES)) {
debug('%s too many network errors (%s), give up', this._humanId, tries)
throw error
}
// TODO: ability to cancel the connection
// TODO: ability to force immediate reconnection
// TODO: implement back-off
return Bluebird.delay(5e3).then(() => {
// TODO: handling not responding host.
return this._transportCall(method, args, tries + 1)
})
})
.catch(isHostSlave, ({params: [master]}) => {
debug('%s: host is slave, attempting to connect at %s', this._humanId, master)
this._url.host = master
this._init()
return this._transportCall(method, args)
})
}
// Lowest level call: do not handle any errors.
_rawCall (method, args) {
return this._xmlRpcCall(method, args)
.then(result => {
const {Status: status} = result
@ -253,33 +284,6 @@ export class Xapi extends EventEmitter {
throw new XapiError(result.ErrorDescription)
})
.catch(isHostSlave, ({params: [master]}) => {
debug('%s: host is slave, attempting to connect at %s', this._humanId, master)
this._url.host = master
this._init()
return this._transportCall(method, args)
})
.catch(isNetworkError, isXapiNetworkError, () => {
debug('%s: a network error happened', this._humanId)
if (++this._tries > MAX_TRIES) {
throw new Error('will not try anymore')
}
// TODO: ability to cancel the connection
// TODO: ability to force immediate reconnection
// TODO: implement back-off
return Bluebird.delay(5e3).then(() => {
// TODO: handling not responding host.
return this._transportCall(method, args).then(() => {
this._tries = 0
})
})
})
.cancellable()
}