Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-1825 Live-backup topology not correctly displayed on console 

Second commit. The topology shown on backup's console is not yet
correct. This fixes the problem.
This commit is contained in:
Howard Gao 2019-06-18 17:36:29 +08:00 committed by Francesco Nigro
parent 7e6efb26e2
commit 18d5502d6d
1 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/brokerDiagram.js
View File

@ -448,32 +448,69 @@ var ARTEMIS = (function(ARTEMIS) {
ARTEMISService.artemisConsole.getRemoteBrokers(mBean, containerJolokia, onSuccess(function (properties) { ARTEMISService.artemisConsole.getRemoteBrokers(mBean, containerJolokia, onSuccess(function (properties) {
remoteBrokers = properties.value; remoteBrokers = properties.value;
ARTEMIS.log.info("remoteBrokers=" + angular.toJson(remoteBrokers)) var remoteBrokersObj = angular.fromJson(remoteBrokers);
angular.forEach(angular.fromJson(remoteBrokers), function (remoteBroker) {
if (remoteBroker) {
ARTEMIS.log.info("remote=" + angular.toJson(remoteBroker))
if (broker.nodeId != remoteBroker.nodeID) {
getOrAddBroker(true, "\"" + remoteBroker.live + "\"", remoteBroker.nodeID, "remote", null, properties);
addLinkIds("broker:" + broker.brokerId, "broker:" + "\"" + remoteBroker.live + "\"", "network");
var backup = remoteBroker.backup; var newBackReq = ARTEMISService.artemisConsole.isBackup(jolokia, mBean);
if (backup) { var newBackup = newBackReq.value;
getOrAddBroker(false, "\"" + backup + "\"", remoteBroker.nodeID, "remote", null, properties);
addLinkIds("broker:" + "\"" + remoteBroker.live + "\"", "broker:" + "\"" + backup + "\"", "network"); angular.forEach(remoteBrokersObj, function (remoteBroker) {
if (broker.nodeId != remoteBroker.nodeID) {
if (remoteBroker.live) {
getOrAddBroker(true, "\"" + remoteBroker.live + "\"", remoteBroker.nodeID, "remote", null, properties);
}
if (remoteBroker.backup) {
getOrAddBroker(false, "\"" + remoteBroker.backup + "\"", remoteBroker.nodeID, "remote", null, properties);
}
} else {
if (!newBackup) {
getOrAddBroker(false, "\"" + remoteBroker.backup + "\"", remoteBroker.nodeID, "remote", null, properties);
} else {
getOrAddBroker(true, "\"" + remoteBroker.live + "\"", remoteBroker.nodeID, "remote", null, properties);
}
}
});
var processedLiveBrokers = [];
angular.forEach(remoteBrokersObj, function (remoteBroker) {
if (remoteBroker) {
if (remoteBroker.live) {
angular.forEach(processedLiveBrokers, function(livebroker) {
//because the local broker has a different id format we need to identify it
if (broker.nodeId == livebroker.nodeID) {
if (!newBackup) {
addLinkIds("broker:" + broker.brokerId, "broker:" + "\"" + remoteBroker.live + "\"", "network");
} else {
//I am backup
addLinkIds("broker:" + "\"" + livebroker.live + "\"", "broker:" + "\"" + remoteBroker.live + "\"", "network");
}
} else if (broker.nodeId == remoteBroker.nodeID) {
if (!newBackup) {
addLinkIds("broker:" + broker.brokerId, "broker:" + "\"" + livebroker.live + "\"", "network");
} else {
//I am backup
addLinkIds("broker:" + "\"" + livebroker.live + "\"", "broker:" + "\"" + remoteBroker.live + "\"", "network");
}
} else {
addLinkIds("broker:" + "\"" + livebroker.live + "\"", "broker:" + "\"" + remoteBroker.live + "\"", "network");
}
});
processedLiveBrokers.push(remoteBroker);
}
//now backups
if (broker.nodeId != remoteBroker.nodeID) {
if (remoteBroker.backup) {
addLinkIds("broker:" + "\"" + remoteBroker.live + "\"", "broker:" + "\"" + remoteBroker.backup + "\"", "network");
} }
} }
else { else {
var newBackReq = ARTEMISService.artemisConsole.isBackup(jolokia, mBean);
var newBackup = newBackReq.value;
if (!newBackup) { if (!newBackup) {
if (remoteBroker.backup) { if (remoteBroker.backup) {
getOrAddBroker(false, "\"" + remoteBroker.backup + "\"", remoteBroker.nodeID, "remote", null, properties);
addLinkIds("broker:" + broker.brokerId, "broker:" + "\"" + remoteBroker.backup + "\"", "network"); addLinkIds("broker:" + broker.brokerId, "broker:" + "\"" + remoteBroker.backup + "\"", "network");
} }
} }
else { else {
//I am backup //I am backup
getOrAddBroker(true, "\"" + remoteBroker.live + "\"", remoteBroker.nodeID, "remote", null, properties);
addLinkIds("broker:" + broker.brokerId, "broker:" + "\"" + remoteBroker.live + "\"", "network"); addLinkIds("broker:" + broker.brokerId, "broker:" + "\"" + remoteBroker.live + "\"", "network");
} }
} }