You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2014/08/10 22:52:05 UTC
svn commit: r1617159 - in /qpid/trunk/qpid/java:
bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/
bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/
broker-plugins/management-http/src/main/java/resource...
Author: kwall
Date: Sun Aug 10 20:52:05 2014
New Revision: 1617159
URL: http://svn.apache.org/r1617159
Log:
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.
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java?rev=1617159&r1=1617158&r2=1617159&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java Sun Aug 10 20:52:05 2014
@@ -852,6 +852,7 @@ public class BDBHAVirtualHostNodeImpl ex
if (nodeState == null)
{
remoteNode.setRole(ReplicatedEnvironment.State.UNKNOWN.name());
+ remoteNode.setLastTransactionId(-1);
if (!remoteNode.isDetached())
{
getEventLogger().message(getVirtualHostNodeLogSubject(), HighAvailabilityMessages.DETACHED(remoteNode.getName(), getGroupName()));
Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js?rev=1617159&r1=1617158&r2=1617159&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js Sun Aug 10 20:52:05 2014
@@ -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,
{
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1617159&r1=1617158&r2=1617159&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js Sun Aug 10 20:52:05 2014
@@ -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";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org