diff options
| author | Keith Wall <kwall@apache.org> | 2014-08-10 20:52:05 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-08-10 20:52:05 +0000 |
| commit | c388c89c4ccf74c82d27dc8fd3915e775b5f8ad4 (patch) | |
| tree | b37e4660c156c8f084ae20d2bd28514b239b8639 /qpid/java | |
| parent | f2645184bedbf756eda741f121224e95f5fc8fba (diff) | |
| download | qpid-python-c388c89c4ccf74c82d27dc8fd3915e775b5f8ad4.tar.gz | |
QPID-5982: [Java Broker] BDB HA: Reset replication transaction id when contact with remote node is lost
* Change BDB HA VHN tab so that replication transaction id -1 is shown as N/A
* Adjust width of VH table on Broker tab to avoid state UNAVAIABLE wrapping over two lines.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1617159 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
3 files changed, 6 insertions, 5 deletions
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java index 899cf6606e..cacb04736c 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java @@ -852,6 +852,7 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu if (nodeState == null) { remoteNode.setRole(ReplicatedEnvironment.State.UNKNOWN.name()); + remoteNode.setLastTransactionId(-1); if (!remoteNode.isDetached()) { getEventLogger().message(getVirtualHostNodeLogSubject(), HighAvailabilityMessages.DETACHED(remoteNode.getName(), getGroupName())); diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js index f927b81c9d..b5e12a664e 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js @@ -99,7 +99,7 @@ define(["dojo/_base/xhr", { name: 'Role', field: 'role', width: '10%' }, { name: 'Address', field: 'address', width: '35%' }, { name: 'Join Time', field: 'joinTime', width: '25%', formatter: function(value){ return value ? UserPreferences.formatDateTime(value) : "";} }, - { name: 'Replication Transaction ID', field: 'lastKnownReplicationTransactionId', width: '20%' } + { name: 'Replication Transaction ID', field: 'lastKnownReplicationTransactionId', width: '20%', formatter: function(value){ return value > 0 ? value : "N/A";} } ], null, { diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js index 11a79984b3..8cc3e76b58 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js @@ -356,20 +356,20 @@ define(["dojo/_base/xhr", that.vhostsGrid = new UpdatableStore(that.brokerData.virtualhostnodes, query(".broker-virtualhosts")[0], [ - { name: "Node Name", field: "name", width: "15%"}, + { name: "Node Name", field: "name", width: "10%"}, { name: "Node State", field: "state", width: "10%"}, { name: "Node Type", field: "type", width: "10%"}, - { name: "Host Name", field: "_item", width: "15%", + { name: "Host Name", field: "_item", width: "10%", formatter: function(item){ return item && item.virtualhosts? item.virtualhosts[0].name: "N/A"; } }, - { name: "Host State", field: "_item", width: "10%", + { name: "Host State", field: "_item", width: "15%", formatter: function(item){ return item && item.virtualhosts? item.virtualhosts[0].state: "N/A"; } }, - { name: "Host Type", field: "_item", width: "10%", + { name: "Host Type", field: "_item", width: "15%", formatter: function(item){ return item && item.virtualhosts? item.virtualhosts[0].type: "N/A"; } |