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

MXS-1300: Move service checks in cluster to a function

Browse Source 
The check that the two MaxScales have the same services is now in a common
function. Added more details into the error message as to why the command
failed. The hosts and their extra services are logged for both the source
and target of the command.

The `cluster diff` command could display the extra services in the diff
but this could be interpreted as a sign that MaxScale could act on that
part of the diff. Returning an error instead of silently ignoring the
extra services should allow for a more consistent user experience.
This commit is contained in:
Markus Mäkelä
2017-08-07 09:36:25 +03:00
parent f422e92496
commit 70ae93a9ab
1 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
maxctrl/lib/cluster.js
View File

@ -37,10 +37,31 @@ function getChangedObjects(a, b) {
} }
// Check if the diffs add or delete services // Check if the diffs add or delete services
function haveExtraServices(src, dest) { function haveExtraServices(src, dest, srcHost, destHost) {
var newObj = getDifference(src.services.data, dest.services.data) var newObj = getDifference(src.services.data, dest.services.data)
var oldObj = getDifference(dest.services.data, src.services.data) var oldObj = getDifference(dest.services.data, src.services.data)
return newObj.length > 0 || oldObj.length > 0
if (newObj.length > 0 || oldObj.length > 0) {
const EOL = require('os').EOL
var srcObj = _.transform(newObj, function(out, i) {
out.push(i.id)
})
var destObj = _.transform(oldObj, function(out, i) {
out.push(i.id)
})
err = ['Cannot diff host `' + srcHost + '` with target `' +
destHost + '`: New or deleted services on target host, ' +
'both hosts must have the same services.',
'Extra services on `' + srcHost + '`:',
JSON.stringify(srcObj, null, 4),
'Extra services on `' + destHost + '`:',
JSON.stringify(destObj, null, 4)
]
return error(err.join(EOL))
}
return undefined
} }
// Resource collections // Resource collections
@ -114,6 +135,11 @@ exports.builder = function(yargs) {
var src = diffs[0] var src = diffs[0]
var dest = diffs[1] var dest = diffs[1]
var err = haveExtraServices(src, dest, host, argv.target)
if (err) {
return err
}
_.uniq(_.concat(Object.keys(src), Object.keys(dest))).forEach(function(i) { _.uniq(_.concat(Object.keys(src), Object.keys(dest))).forEach(function(i) {
var newObj = getDifference(src[i].data, dest[i].data) var newObj = getDifference(src[i].data, dest[i].data)
var oldObj = getDifference(dest[i].data, src[i].data) var oldObj = getDifference(dest[i].data, src[i].data)
@ -154,10 +180,9 @@ exports.builder = function(yargs) {
var src = diffs[0] var src = diffs[0]
var dest = diffs[1] var dest = diffs[1]
if (haveExtraServices(src, dest)) { var err = haveExtraServices(src, dest, host, argv.target)
return error('Cannot synchronize host `' + host + '` with target `' + if (err) {
argv.target + '`: New or deleted services on target host, ' + return err
'both hosts must have the same services.')
} }
// Delete old servers // Delete old servers