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

Many fixes. Cron Job is in a job structure.

Browse Source
This commit is contained in:
wescoeur 2016-03-02 12:16:30 +01:00
parent d9bf7c7d12
commit e5146f7def
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/xo-server-load-balancer/src/index.js
View File

@ -36,11 +36,11 @@ const MINUTES_OF_HISTORICAL_DATA = 30
// Threshold cpu in percent. // Threshold cpu in percent.
// const CRITICAL_THRESHOLD_CPU = 90 // const CRITICAL_THRESHOLD_CPU = 90
const HIGH_THRESHOLD_CPU = 76.5 const HIGH_THRESHOLD_CPU = 75
// const LOW_THRESHOLD_CPU = 22.5 // const LOW_THRESHOLD_CPU = 22.5
// const CRITICAL_THRESHOLD_FREE_MEMORY = 51 // const CRITICAL_THRESHOLD_FREE_MEMORY = 50
const HIGH_THRESHOLD_FREE_MEMORY = 63.75 const HIGH_THRESHOLD_FREE_MEMORY = 65
// const LOW_THRESHOLD_FREE_MEMORY = 1020 // const LOW_THRESHOLD_FREE_MEMORY = 1020
// =================================================================== // ===================================================================
@ -115,7 +115,7 @@ export const configurationSchema = {
// =================================================================== // ===================================================================
const makeCronJob = (cronPattern, fn) => { const makeJob = (cronPattern, fn) => {
const job = { const job = {
running: false, running: false,
emitter: new Emitter() emitter: new Emitter()
@ -396,21 +396,21 @@ class Plan {
class LoadBalancerPlugin { class LoadBalancerPlugin {
constructor (xo) { constructor (xo) {
this.xo = xo this.xo = xo
this._cronJob = makeCronJob(`*/${EXECUTION_DELAY} * * * *`, ::this._executePlans) this._job = makeJob(`*/${EXECUTION_DELAY} * * * *`, ::this._executePlans)
this._emitter this._emitter
} }
async configure ({ plans }) { async configure ({ plans }) {
const cronJob = this._cronJob const job = this._job
const enabled = cronJob.isEnabled() const enabled = job.isEnabled()
if (enabled) { if (enabled) {
cronJob.stop() job.stop()
} }
// Wait until all old plans stopped running. // Wait until all old plans stopped running.
if (cronJob.running) { if (job.running) {
await eventToPromise(cronJob.emitter, 'finish') await eventToPromise(job.emitter, 'finish')
} }
this._plans = [] this._plans = []
@ -437,25 +437,17 @@ class LoadBalancerPlugin {
} }
} }
// TMP
this._addPlan({
name: 'Test plan',
mode: PERFORMANCE_MODE,
behavior: AGGRESSIVE_BEHAVIOR,
poolIds: [ '313624ab-0958-bb1e-45b5-7556a463a10b' ]
})
if (enabled) { if (enabled) {
cronJob.start() job.start()
} }
} }
load () { load () {
this._cronJob.start() this._job.cron.start()
} }
unload () { unload () {
this._cronJob.stop() this._job.cron.stop()
} }
_addPlan (plan) { _addPlan (plan) {