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

Adding a container property to the zk node data used by the leveldb replication. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1504626 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2013-07-18 20:04:45 +00:00
parent cf9cccacf8
commit ae5abf143b
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
View File

@ -75,6 +75,9 @@ class ElectingLevelDBStore extends ProxyLevelDBStore {
var brokerName: String = _ var brokerName: String = _
@BeanProperty
var container: String = _
@BeanProperty @BeanProperty
var hostname: String = _ var hostname: String = _
@BeanProperty @BeanProperty

6
activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterElector.scala
View File

@ -10,6 +10,9 @@ class LevelDBNodeState extends NodeState {
@JsonProperty @JsonProperty
var id: String = _ var id: String = _
@JsonProperty
var container: String = _
@JsonProperty @JsonProperty
var address: String = _ var address: String = _
@ -23,6 +26,7 @@ class LevelDBNodeState extends NodeState {
obj match { obj match {
case x:LevelDBNodeState => case x:LevelDBNodeState =>
x.id == id && x.id == id &&
x.container == container &&
x.address == address && x.address == address &&
x.position == position && x.position == position &&
x.elected == elected x.elected == elected
@ -73,6 +77,8 @@ class MasterElector(store: ElectingLevelDBStore) extends ClusteredSingleton[Leve
rc.elected = elected rc.elected = elected
rc.position = position rc.position = position
rc.address = address rc.address = address
rc.container = store.container
rc.address = address
rc rc
} }