[jira] [Commented] (ARTEMIS-1825) Live-backup topology not correctly displayed on console
[ https://issues.apache.org/jira/browse/ARTEMIS-1825?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16868571#comment-16868571 ] ASF subversion and git services commented on ARTEMIS-1825: -- Commit 18d5502d6db298b0a1dc344a69cb49e45d0c33a4 in activemq-artemis's branch refs/heads/master from Howard Gao [ https://gitbox.apache.org/repos/asf?p=activemq-artemis.git;h=18d5502 ] 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. > Live-backup topology not correctly displayed on console > --- > > Key: ARTEMIS-1825 > URL: https://issues.apache.org/jira/browse/ARTEMIS-1825 > Project: ActiveMQ Artemis > Issue Type: Bug > Components: Web Console >Affects Versions: 2.5.0 >Reporter: Howard Gao >Assignee: Howard Gao >Priority: Major > Fix For: 2.6.4, 2.7.0 > > Time Spent: 0.5h > Remaining Estimate: 0h > > The backup's web console doesn't correctly shows the topology diagram of > live-backup pair. It points to itself. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARTEMIS-1825) Live-backup topology not correctly displayed on console
[ https://issues.apache.org/jira/browse/ARTEMIS-1825?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16686797#comment-16686797 ] ASF subversion and git services commented on ARTEMIS-1825: -- Commit 59300713a7e994c05d72cc4e5c03fdacc8b5a50c in activemq-artemis's branch refs/heads/2.6.x from [~gaohoward] [ https://git-wip-us.apache.org/repos/asf?p=activemq-artemis.git;h=5930071 ] ARTEMIS-1825 Live-backup topology not correctly displayed on console (cherry picked from commit ae320c14a5db988f410242e44b9d6e5438c7914c) > Live-backup topology not correctly displayed on console > --- > > Key: ARTEMIS-1825 > URL: https://issues.apache.org/jira/browse/ARTEMIS-1825 > Project: ActiveMQ Artemis > Issue Type: Bug > Components: Web Console >Affects Versions: 2.5.0 >Reporter: Howard Gao >Assignee: Howard Gao >Priority: Major > Fix For: 2.7.0 > > > The backup's web console doesn't correctly shows the topology diagram of > live-backup pair. It points to itself. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARTEMIS-1825) Live-backup topology not correctly displayed on console
[ https://issues.apache.org/jira/browse/ARTEMIS-1825?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16681528#comment-16681528 ] ASF GitHub Bot commented on ARTEMIS-1825: - Github user asfgit closed the pull request at: https://github.com/apache/activemq-artemis/pull/2041 > Live-backup topology not correctly displayed on console > --- > > Key: ARTEMIS-1825 > URL: https://issues.apache.org/jira/browse/ARTEMIS-1825 > Project: ActiveMQ Artemis > Issue Type: Bug > Components: Web Console >Affects Versions: 2.5.0 >Reporter: Howard Gao >Assignee: Howard Gao >Priority: Major > Fix For: 2.7.0 > > > The backup's web console doesn't correctly shows the topology diagram of > live-backup pair. It points to itself. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARTEMIS-1825) Live-backup topology not correctly displayed on console
[ https://issues.apache.org/jira/browse/ARTEMIS-1825?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16681527#comment-16681527 ] ASF subversion and git services commented on ARTEMIS-1825: -- Commit ae320c14a5db988f410242e44b9d6e5438c7914c in activemq-artemis's branch refs/heads/master from [~gaohoward] [ https://git-wip-us.apache.org/repos/asf?p=activemq-artemis.git;h=ae320c1 ] ARTEMIS-1825 Live-backup topology not correctly displayed on console > Live-backup topology not correctly displayed on console > --- > > Key: ARTEMIS-1825 > URL: https://issues.apache.org/jira/browse/ARTEMIS-1825 > Project: ActiveMQ Artemis > Issue Type: Bug > Components: Web Console >Affects Versions: 2.5.0 >Reporter: Howard Gao >Assignee: Howard Gao >Priority: Major > Fix For: 2.7.0 > > > The backup's web console doesn't correctly shows the topology diagram of > live-backup pair. It points to itself. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARTEMIS-1825) Live-backup topology not correctly displayed on console
[ https://issues.apache.org/jira/browse/ARTEMIS-1825?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16681147#comment-16681147 ] ASF GitHub Bot commented on ARTEMIS-1825: - Github user gaohoward commented on the issue: https://github.com/apache/activemq-artemis/pull/2041 np at all. > Live-backup topology not correctly displayed on console > --- > > Key: ARTEMIS-1825 > URL: https://issues.apache.org/jira/browse/ARTEMIS-1825 > Project: ActiveMQ Artemis > Issue Type: Bug > Components: Web Console >Affects Versions: 2.5.0 >Reporter: Howard Gao >Assignee: Howard Gao >Priority: Major > Fix For: 2.7.0 > > > The backup's web console doesn't correctly shows the topology diagram of > live-backup pair. It points to itself. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARTEMIS-1825) Live-backup topology not correctly displayed on console
[ https://issues.apache.org/jira/browse/ARTEMIS-1825?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16681134#comment-16681134 ] ASF GitHub Bot commented on ARTEMIS-1825: - Github user michaelandrepearce commented on the issue: https://github.com/apache/activemq-artemis/pull/2041 Great ill merge this shortly then. Thanks for the contribution, and sorry again for taking soo long to review it > Live-backup topology not correctly displayed on console > --- > > Key: ARTEMIS-1825 > URL: https://issues.apache.org/jira/browse/ARTEMIS-1825 > Project: ActiveMQ Artemis > Issue Type: Bug > Components: Web Console >Affects Versions: 2.5.0 >Reporter: Howard Gao >Assignee: Howard Gao >Priority: Major > Fix For: 2.7.0 > > > The backup's web console doesn't correctly shows the topology diagram of > live-backup pair. It points to itself. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARTEMIS-1825) Live-backup topology not correctly displayed on console
[ https://issues.apache.org/jira/browse/ARTEMIS-1825?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16681083#comment-16681083 ] ASF GitHub Bot commented on ARTEMIS-1825: - Github user gaohoward commented on the issue: https://github.com/apache/activemq-artemis/pull/2041 @michaelandrepearce Yes that's the idea. > Live-backup topology not correctly displayed on console > --- > > Key: ARTEMIS-1825 > URL: https://issues.apache.org/jira/browse/ARTEMIS-1825 > Project: ActiveMQ Artemis > Issue Type: Bug > Components: Web Console >Affects Versions: 2.5.0 >Reporter: Howard Gao >Assignee: Howard Gao >Priority: Major > Fix For: 2.7.0 > > > The backup's web console doesn't correctly shows the topology diagram of > live-backup pair. It points to itself. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARTEMIS-1825) Live-backup topology not correctly displayed on console
[ https://issues.apache.org/jira/browse/ARTEMIS-1825?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16680637#comment-16680637 ] ASF GitHub Bot commented on ARTEMIS-1825: - Github user michaelandrepearce commented on the issue: https://github.com/apache/activemq-artemis/pull/2041 @gaohoward sorry taken a while to look at this as have been burning hours on other issue. From what i can tell from the JS this looks ok, i assume form reading the js, the idea here is more clearly show who is live and who is a slave, calling a method to deduce this, rather than the hardcoded master=true, is this roughly a correct understanding? If so +1 from me. > Live-backup topology not correctly displayed on console > --- > > Key: ARTEMIS-1825 > URL: https://issues.apache.org/jira/browse/ARTEMIS-1825 > Project: ActiveMQ Artemis > Issue Type: Bug > Components: Web Console >Affects Versions: 2.5.0 >Reporter: Howard Gao >Assignee: Howard Gao >Priority: Major > Fix For: 2.7.0 > > > The backup's web console doesn't correctly shows the topology diagram of > live-backup pair. It points to itself. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARTEMIS-1825) Live-backup topology not correctly displayed on console
[ https://issues.apache.org/jira/browse/ARTEMIS-1825?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16462749#comment-16462749 ] ASF GitHub Bot commented on ARTEMIS-1825: - Github user clebertsuconic commented on the issue: https://github.com/apache/activemq-artemis/pull/2041 @mtaylor / @andytaylor / @michaelandrepearce I didn't work on this module a lot... can you guys check on this? > Live-backup topology not correctly displayed on console > --- > > Key: ARTEMIS-1825 > URL: https://issues.apache.org/jira/browse/ARTEMIS-1825 > Project: ActiveMQ Artemis > Issue Type: Bug > Components: Web Console >Affects Versions: 2.5.0 >Reporter: Howard Gao >Assignee: Howard Gao >Priority: Major > Fix For: 2.5.1 > > > The backup's web console doesn't correctly shows the topology diagram of > live-backup pair. It points to itself. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARTEMIS-1825) Live-backup topology not correctly displayed on console
[ https://issues.apache.org/jira/browse/ARTEMIS-1825?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16454242#comment-16454242 ] ASF GitHub Bot commented on ARTEMIS-1825: - Github user clebertsuconic commented on a diff in the pull request: https://github.com/apache/activemq-artemis/pull/2041#discussion_r184398314 --- Diff: artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/brokerDiagram.js --- @@ -461,10 +463,20 @@ var ARTEMIS = (function(ARTEMIS) { } } else { - var backup = remoteBroker.backup; - if (backup) { - getOrAddBroker(false, "\"" + remoteBroker.backup + "\"", remoteBroker.nodeID, "remote", null, properties); - addLinkIds("broker:" + broker.brokerId, "broker:" + "\"" + remoteBroker.backup + "\"", "network"); + var newBackReq = ARTEMISService.artemisConsole.isBackup(jolokia, mBean); + var newBackup = newBackReq.value; + if (!newBackup) { + ARTEMIS.log.debug("yes I'm master right now"); --- End diff -- You still have unintended debug messages here > Live-backup topology not correctly displayed on console > --- > > Key: ARTEMIS-1825 > URL: https://issues.apache.org/jira/browse/ARTEMIS-1825 > Project: ActiveMQ Artemis > Issue Type: Bug > Components: Web Console >Affects Versions: 2.5.0 >Reporter: Howard Gao >Assignee: Howard Gao >Priority: Major > Fix For: 2.5.1 > > > The backup's web console doesn't correctly shows the topology diagram of > live-backup pair. It points to itself. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARTEMIS-1825) Live-backup topology not correctly displayed on console
[ https://issues.apache.org/jira/browse/ARTEMIS-1825?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16453895#comment-16453895 ] ASF GitHub Bot commented on ARTEMIS-1825: - Github user gaohoward commented on the issue: https://github.com/apache/activemq-artemis/pull/2041 @clebertsuconic done. > Live-backup topology not correctly displayed on console > --- > > Key: ARTEMIS-1825 > URL: https://issues.apache.org/jira/browse/ARTEMIS-1825 > Project: ActiveMQ Artemis > Issue Type: Bug > Components: Web Console >Affects Versions: 2.5.0 >Reporter: Howard Gao >Assignee: Howard Gao >Priority: Major > Fix For: 2.5.1 > > > The backup's web console doesn't correctly shows the topology diagram of > live-backup pair. It points to itself. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARTEMIS-1825) Live-backup topology not correctly displayed on console
[ https://issues.apache.org/jira/browse/ARTEMIS-1825?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16453413#comment-16453413 ] ASF GitHub Bot commented on ARTEMIS-1825: - Github user gaohoward commented on a diff in the pull request: https://github.com/apache/activemq-artemis/pull/2041#discussion_r184259404 --- Diff: artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/brokerDiagram.js --- @@ -455,16 +457,27 @@ var ARTEMIS = (function(ARTEMIS) { addLinkIds("broker:" + broker.brokerId, "broker:" + "\"" + remoteBroker.live + "\"", "network"); var backup = remoteBroker.backup; + ARTEMIS.log.info("isbackup? " + backup); if (backup) { getOrAddBroker(false, "\"" + backup + "\"", remoteBroker.nodeID, "remote", null, properties); addLinkIds("broker:" + "\"" + remoteBroker.live + "\"", "broker:" + "\"" + backup + "\"", "network"); } } else { - var backup = remoteBroker.backup; - if (backup) { - getOrAddBroker(false, "\"" + remoteBroker.backup + "\"", remoteBroker.nodeID, "remote", null, properties); - addLinkIds("broker:" + broker.brokerId, "broker:" + "\"" + remoteBroker.backup + "\"", "network"); + var newBackReq = ARTEMISService.artemisConsole.isBackup(jolokia, mBean); + var newBackup = newBackReq.value; + if (!newBackup) { + ARTEMIS.log.info("yes I'm master right now"); + if (remoteBroker.backup) { +getOrAddBroker(false, "\"" + remoteBroker.backup + "\"", remoteBroker.nodeID, "remote", null, properties); +addLinkIds("broker:" + broker.brokerId, "broker:" + "\"" + remoteBroker.backup + "\"", "network"); + } + } + else { + ARTEMIS.log.info("ok I'm backup!"); --- End diff -- Yes should be debug. I'll change that. Thx. > Live-backup topology not correctly displayed on console > --- > > Key: ARTEMIS-1825 > URL: https://issues.apache.org/jira/browse/ARTEMIS-1825 > Project: ActiveMQ Artemis > Issue Type: Bug > Components: Web Console >Affects Versions: 2.5.0 >Reporter: Howard Gao >Assignee: Howard Gao >Priority: Major > Fix For: 2.5.1 > > > The backup's web console doesn't correctly shows the topology diagram of > live-backup pair. It points to itself. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARTEMIS-1825) Live-backup topology not correctly displayed on console
[ https://issues.apache.org/jira/browse/ARTEMIS-1825?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16452901#comment-16452901 ] ASF GitHub Bot commented on ARTEMIS-1825: - Github user clebertsuconic commented on a diff in the pull request: https://github.com/apache/activemq-artemis/pull/2041#discussion_r184175183 --- Diff: artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/brokerDiagram.js --- @@ -455,16 +457,27 @@ var ARTEMIS = (function(ARTEMIS) { addLinkIds("broker:" + broker.brokerId, "broker:" + "\"" + remoteBroker.live + "\"", "network"); var backup = remoteBroker.backup; + ARTEMIS.log.info("isbackup? " + backup); if (backup) { getOrAddBroker(false, "\"" + backup + "\"", remoteBroker.nodeID, "remote", null, properties); addLinkIds("broker:" + "\"" + remoteBroker.live + "\"", "broker:" + "\"" + backup + "\"", "network"); } } else { - var backup = remoteBroker.backup; - if (backup) { - getOrAddBroker(false, "\"" + remoteBroker.backup + "\"", remoteBroker.nodeID, "remote", null, properties); - addLinkIds("broker:" + broker.brokerId, "broker:" + "\"" + remoteBroker.backup + "\"", "network"); + var newBackReq = ARTEMISService.artemisConsole.isBackup(jolokia, mBean); + var newBackup = newBackReq.value; + if (!newBackup) { + ARTEMIS.log.info("yes I'm master right now"); --- End diff -- this is a debug message.. you probably didn't mean to have it here. > Live-backup topology not correctly displayed on console > --- > > Key: ARTEMIS-1825 > URL: https://issues.apache.org/jira/browse/ARTEMIS-1825 > Project: ActiveMQ Artemis > Issue Type: Bug > Components: Web Console >Affects Versions: 2.5.0 >Reporter: Howard Gao >Assignee: Howard Gao >Priority: Major > Fix For: 2.5.1 > > > The backup's web console doesn't correctly shows the topology diagram of > live-backup pair. It points to itself. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARTEMIS-1825) Live-backup topology not correctly displayed on console
[ https://issues.apache.org/jira/browse/ARTEMIS-1825?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16452902#comment-16452902 ] ASF GitHub Bot commented on ARTEMIS-1825: - Github user clebertsuconic commented on a diff in the pull request: https://github.com/apache/activemq-artemis/pull/2041#discussion_r184175230 --- Diff: artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/brokerDiagram.js --- @@ -455,16 +457,27 @@ var ARTEMIS = (function(ARTEMIS) { addLinkIds("broker:" + broker.brokerId, "broker:" + "\"" + remoteBroker.live + "\"", "network"); var backup = remoteBroker.backup; + ARTEMIS.log.info("isbackup? " + backup); if (backup) { getOrAddBroker(false, "\"" + backup + "\"", remoteBroker.nodeID, "remote", null, properties); addLinkIds("broker:" + "\"" + remoteBroker.live + "\"", "broker:" + "\"" + backup + "\"", "network"); } } else { - var backup = remoteBroker.backup; - if (backup) { - getOrAddBroker(false, "\"" + remoteBroker.backup + "\"", remoteBroker.nodeID, "remote", null, properties); - addLinkIds("broker:" + broker.brokerId, "broker:" + "\"" + remoteBroker.backup + "\"", "network"); + var newBackReq = ARTEMISService.artemisConsole.isBackup(jolokia, mBean); + var newBackup = newBackReq.value; + if (!newBackup) { + ARTEMIS.log.info("yes I'm master right now"); + if (remoteBroker.backup) { +getOrAddBroker(false, "\"" + remoteBroker.backup + "\"", remoteBroker.nodeID, "remote", null, properties); +addLinkIds("broker:" + broker.brokerId, "broker:" + "\"" + remoteBroker.backup + "\"", "network"); + } + } + else { + ARTEMIS.log.info("ok I'm backup!"); --- End diff -- debug message > Live-backup topology not correctly displayed on console > --- > > Key: ARTEMIS-1825 > URL: https://issues.apache.org/jira/browse/ARTEMIS-1825 > Project: ActiveMQ Artemis > Issue Type: Bug > Components: Web Console >Affects Versions: 2.5.0 >Reporter: Howard Gao >Assignee: Howard Gao >Priority: Major > Fix For: 2.5.1 > > > The backup's web console doesn't correctly shows the topology diagram of > live-backup pair. It points to itself. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (ARTEMIS-1825) Live-backup topology not correctly displayed on console
[ https://issues.apache.org/jira/browse/ARTEMIS-1825?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16449259#comment-16449259 ] ASF GitHub Bot commented on ARTEMIS-1825: - GitHub user gaohoward opened a pull request: https://github.com/apache/activemq-artemis/pull/2041 ARTEMIS-1825 Live-backup topology not correctly displayed on console You can merge this pull request into a Git repository by running: $ git pull https://github.com/gaohoward/activemq-artemis h1825 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/activemq-artemis/pull/2041.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #2041 commit 82241555d48ece29a76b6b48da8921225e747d87 Author: Howard GaoDate: 2018-04-24T04:08:33Z ARTEMIS-1825 Live-backup topology not correctly displayed on console > Live-backup topology not correctly displayed on console > --- > > Key: ARTEMIS-1825 > URL: https://issues.apache.org/jira/browse/ARTEMIS-1825 > Project: ActiveMQ Artemis > Issue Type: Bug > Components: Web Console >Affects Versions: 2.5.0 >Reporter: Howard Gao >Assignee: Howard Gao >Priority: Major > Fix For: 2.5.1 > > > The backup's web console doesn't correctly shows the topology diagram of > live-backup pair. It points to itself. -- This message was sent by Atlassian JIRA (v7.6.3#76005)