hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1656: Request each monitor only once

Browse Source 
When the servers were iterated, each related monitor was requested. This
caused as many requests for monitors as there are servers.

By creating a set of unique monitor names and requesting them once, we
avoid the redundant requests from the monitor.
This commit is contained in:
Markus Mäkelä
2018-02-16 21:41:23 +02:00
parent f4af4fa038
commit 5806a27f9a
1 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
maxctrl/lib/list.js
View File

@ -36,43 +36,38 @@ exports.builder = function(yargs) {
return getJson(host, 'servers') return getJson(host, 'servers')
.then((res) => { .then((res) => {
promises = [] // Build a set of unique monitors, flatten it into an array of strings and
// filter out any duplicate or undefined values (from servers that aren't
// Iterate over all servers, fetching the monitor that "owns" the server // monitored).
res.data.forEach((i) => { var v = _.uniq(_.flatten(_.getPath(res, 'data[].relationships.monitors.data[].id'))).filter(i => i)
// Assign an empty value so we always have something to print
i.attributes.gtid_current_pos = ''
owner = _.get(i, 'relationships.monitors.data[0].id')
if (owner) {
// This servers is monitored by a monitor, get the monitor resource
promises.push(
getJson(host, 'monitors/' + owner)
.then((res) => {
// Check if the monitor defines a server_info object
info = _.get(res, 'data.attributes.monitor_diagnostics.server_info')
// Get the server_info object for each monitor (if it defines one)
var infos = []
var promises = v.map((i) => getJson(host, 'monitors/' + i)
.then((j) => {
info = _.get(j, 'data.attributes.monitor_diagnostics.server_info')
if (info) { if (info) {
info.forEach((k) => infos.push(k))
// Monitor defines it, see if we have a GTID value for this server
info.forEach((j) => {
if (j.name == i.id && j.gtid_current_pos) {
// Found the server_info object for this server, get the Gtid_Current_Pos from it
i.attributes.gtid_current_pos = j.gtid_current_pos
}
})
} }
})) }))
// Wait for promises to resolve
return Promise.all(promises)
.then(() => {
res.data.forEach((i) => {
// Get the gtid_current_pos value for each server from the server_info list
var idx = infos.findIndex((info) => info.name == i.id)
if (idx != -1 && infos[idx].gtid_current_pos) {
// Found the GTID position of this server
i.attributes.gtid_current_pos = infos[idx].gtid_current_pos
} else {
// Assign an empty value so we always have something to print
i.attributes.gtid_current_pos = ''
} }
}) })
})
// We now have all servers as slightly modified resources and possibly a set
// of promises that are getting the related monitor resources which need to
// complete.
return Promise.all(promises)
.then(() => filterResource(res, fields)) .then(() => filterResource(res, fields))
.then((res) => rawCollectionAsTable(res, fields)) .then((res) => rawCollectionAsTable(res, fields))
}) })