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

Optimize hosts in order priority.

Browse Source
This commit is contained in:
wescoeur 2016-03-17 11:21:15 +01:00
parent da0c1cec22
commit 12e0759711
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -438,19 +438,25 @@ class PerformancePlan extends Plan {
toOptimize toOptimize
} = results } = results
const exceededHost = searchObject(toOptimize, (a, b) => { toOptimize.sort((a, b) => {
a = averages[a.id] a = averages[a.id]
b = averages[b.id] b = averages[b.id]
return (b.cpu - a.cpu) || (a.memoryFree - b.memoryFree) return (b.cpu - a.cpu) || (a.memoryFree - b.memoryFree)
}) })
// Search bests combinations for the worst host. for (const exceededHost of toOptimize) {
await this._optimize({ const { id } = exceededHost
exceededHost,
hosts: filter(hosts, host => host.id !== exceededHost.id), debug(`Try to optimize Host (${exceededHost.id}).`)
hostsAverages: averages
}) // Search bests combinations for the worst host.
await this._optimize({
exceededHost,
hosts: filter(hosts, host => host.id !== id),
hostsAverages: averages
})
}
} }
async _optimize ({ exceededHost, hosts, hostsAverages }) { async _optimize ({ exceededHost, hosts, hostsAverages }) {
@ -466,6 +472,7 @@ class PerformancePlan extends Plan {
const promises = [] const promises = []
const xapiSrc = this.xo.getXapi(exceededHost) const xapiSrc = this.xo.getXapi(exceededHost)
let optimizationsCount = 0
for (const vm of vms) { for (const vm of vms) {
// Search host with lower cpu usage. // Search host with lower cpu usage.
@ -489,7 +496,8 @@ class PerformancePlan extends Plan {
exceededAverages.memoryFree += vmAverages.memory exceededAverages.memoryFree += vmAverages.memory
destinationAverages.memoryFree -= vmAverages.memory destinationAverages.memoryFree -= vmAverages.memory
debug(`Migrate VM (${vm.id}) to Host (${destination.id}) from Host (${exceededHost.id})`) debug(`Migrate VM (${vm.id}) to Host (${destination.id}) from Host (${exceededHost.id}).`)
optimizationsCount++
// promises.push( // promises.push(
// xapiSrc.migrateVm(vm._xapiId, this.xo.getXapi(destination), destination._xapiId) // xapiSrc.migrateVm(vm._xapiId, this.xo.getXapi(destination), destination._xapiId)
@ -497,6 +505,7 @@ class PerformancePlan extends Plan {
} }
await Promise.all(promises) await Promise.all(promises)
debug(`${optimizationsCount} optimizations for Host (${exceededHost.id}).`)
return return
} }
@ -618,7 +627,7 @@ class LoadBalancerPlugin {
} }
_executePlans () { _executePlans () {
debug('Execute plans !') debug('Execute plans!')
return Promise.all( return Promise.all(
mapToArray(this._plans, plan => plan.execute()) mapToArray(this._plans, plan => plan.execute())