From 99e046ddea9e6fa1ccd3ac89ea0f6050c18f3bb0 Mon Sep 17 00:00:00 2001 From: wescoeur Date: Thu, 17 Mar 2016 12:11:34 +0100 Subject: [PATCH] Performance mode: The worst host is removed of hosts array after optimization. --- packages/xo-server-load-balancer/src/index.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/xo-server-load-balancer/src/index.js b/packages/xo-server-load-balancer/src/index.js index aa4fef906..bb76a46ec 100644 --- a/packages/xo-server-load-balancer/src/index.js +++ b/packages/xo-server-load-balancer/src/index.js @@ -434,9 +434,9 @@ class PerformancePlan extends Plan { const { averages, - hosts, toOptimize } = results + let { hosts } = results toOptimize.sort((a, b) => { a = averages[a.id] @@ -449,11 +449,12 @@ class PerformancePlan extends Plan { const { id } = exceededHost debug(`Try to optimize Host (${exceededHost.id}).`) + hosts = filter(hosts, host => host.id !== id) // Search bests combinations for the worst host. await this._optimize({ exceededHost, - hosts: filter(hosts, host => host.id !== id), + hosts, hostsAverages: averages }) } @@ -463,7 +464,7 @@ class PerformancePlan extends Plan { const vms = await this._getVms(exceededHost.id) const vmsAverages = await this._getVmsAverages(vms, exceededHost) - // Sort vms by cpu usage. (higher to lower) + // Sort vms by cpu usage. (lower to higher) vms.sort((a, b) => vmsAverages[b.id].cpu - vmsAverages[a.id].cpu )