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

move decision about being a slave from the Broker to the ConnectionContext - so can be done on a Connection basis if required 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@557748 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2007-07-19 19:24:31 +00:00
parent 993f78caac
commit 83a6eff431
13 changed files with 73 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activemq-core/src/main/java/org/apache/activemq/broker/Broker.java
View File

@ -192,11 +192,6 @@ public interface Broker extends Region, Service {
*/
public void processDispatch(MessageDispatch messageDispatch);
/**
* @return true if the broker is running as a slave
*/
public boolean isSlaveBroker();
/**
* @return true if the broker has stopped
*/

4
activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java
View File

@ -201,10 +201,6 @@ public class BrokerFilter implements Broker {
next.processDispatchNotification(messageDispatchNotification);
}
public boolean isSlaveBroker(){
return next.isSlaveBroker();
}
public boolean isStopped(){
return next.isStopped();
}

16
activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -154,6 +154,7 @@ public class BrokerService implements Service {
private boolean useLocalHostBrokerName = false;
private CountDownLatch stoppedLatch = new CountDownLatch(1);
private boolean supportFailOver = false;
private boolean clustered = false;
static{
String localHostName = "localhost";
@ -1121,6 +1122,20 @@ public class BrokerService implements Service {
this.supportFailOver=supportFailOver;
}
/**
* @return the clustered
*/
public boolean isClustered(){
return this.clustered;
}
/**
* @param clustered the clustered to set
*/
public void setClustered(boolean clustered){
this.clustered=clustered;
}
// Implementation methods
// -------------------------------------------------------------------------
/**
@ -1698,5 +1713,4 @@ public class BrokerService implements Service {
}
}
}
}

24
activemq-core/src/main/java/org/apache/activemq/broker/ConnectionContext.java
View File

@ -59,6 +59,7 @@ public class ConnectionContext {
private final AtomicBoolean stopping = new AtomicBoolean();
private final MessageEvaluationContext messageEvaluationContext = new MessageEvaluationContext();
private boolean dontSendReponse;
private boolean clientMaster=true;
public ConnectionContext() {
}
@ -269,4 +270,27 @@ public class ConnectionContext {
return dontSendReponse;
}
/**
* @return the slave
*/
public boolean isSlave(){
return (this.broker!=null&&this.broker.getBrokerService().isSlave())||!this.clientMaster;
}
/**
* @return the clientMaster
*/
public boolean isClientMaster(){
return this.clientMaster;
}
/**
* @param clientMaster the clientMaster to set
*/
public void setClientMaster(boolean clientMaster){
this.clientMaster=clientMaster;
}
}

3
activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java
View File

@ -199,9 +199,6 @@ public class EmptyBroker implements Broker {
}
public boolean isSlaveBroker() {
return false;
}
public boolean isStopped() {
return false;

3
activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java
View File

@ -197,9 +197,6 @@ public class ErrorBroker implements Broker {
throw new BrokerStoppedException(this.message);
}
public boolean isSlaveBroker() {
throw new BrokerStoppedException(this.message);
}
public boolean isStopped() {
return true;

3
activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java
View File

@ -209,9 +209,6 @@ public class MutableBrokerFilter implements Broker {
getNext().processDispatchNotification(messageDispatchNotification);
}
public boolean isSlaveBroker(){
return getNext().isSlaveBroker();
}
public boolean isStopped(){
return getNext().isStopped();

24
activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
View File

@ -658,6 +658,7 @@ public class TransportConnection implements Service,Connection,Task,CommandVisit
context.setClientId(clientId);
context.setUserName(info.getUserName());
context.setConnectionId(info.getConnectionId());
context.setClientMaster(info.isClientMaster());
context.setWireFormatInfo(wireFormatInfo);
context.setNetworkConnection(networkConnection);
context.incrementReference();
@ -1199,17 +1200,18 @@ public class TransportConnection implements Service,Connection,Task,CommandVisit
}
}
protected void disposeTransport() {
if( transportDisposed.compareAndSet(false, true) ) {
try {
transport.stop();
active = false;
log.debug("Stopped connection: "+transport.getRemoteAddress());
} catch (Exception e) {
log.debug("Could not stop transport: "+e,e);
}
}
}
protected void disposeTransport(){
if(transportDisposed.compareAndSet(false,true)){
try{
transport.stop();
active=false;
log.debug("Stopped connection: "+transport.getRemoteAddress());
}catch(Exception e){
log.debug("Could not stop transport: "+e,e);
}
}
}
public int getProtocolVersion() {
return protocolVersion.get();

4
activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java
View File

@ -115,8 +115,8 @@ abstract public class AbstractSubscription implements Subscription {
public void gc() {
}
public boolean isSlaveBroker(){
return broker.isSlaveBroker();
public boolean isSlave(){
return getContext().isSlave();
}
public ConnectionContext getContext() {

12
activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
View File

@ -74,7 +74,7 @@ abstract public class PrefetchSubscription extends AbstractSubscription{
// The slave should not deliver pull messages. TODO: when the slave becomes a master,
// He should send a NULL message to all the consumers to 'wake them up' in case
// they were waiting for a message.
if(getPrefetchSize()==0&&!isSlaveBroker()){
if(getPrefetchSize()==0&&!isSlave()){
prefetchExtension++;
final long dispatchCounterBeforePull=dispatchCounter;
dispatchMatched();
@ -119,7 +119,7 @@ abstract public class PrefetchSubscription extends AbstractSubscription{
pendingEmpty=pending.isEmpty();
enqueueCounter++;
if(!isFull()&&pendingEmpty&&!broker.isSlaveBroker()){
if(!isFull()&&pendingEmpty&&!isSlave()){
dispatch(node);
}else{
optimizePrefetch();
@ -260,7 +260,7 @@ abstract public class PrefetchSubscription extends AbstractSubscription{
if(callDispatchMatched){
dispatchMatched();
}else{
if(isSlaveBroker()){
if(isSlave()){
throw new JMSException("Slave broker out of sync with master: Acknowledgment ("+ack
+") was not in the dispatch list: "+dispatched);
}else{
@ -295,7 +295,7 @@ abstract public class PrefetchSubscription extends AbstractSubscription{
* @return
*/
protected synchronized boolean isFull(){
return isSlaveBroker()||dispatched.size()-prefetchExtension>=info.getPrefetchSize();
return isSlave()||dispatched.size()-prefetchExtension>=info.getPrefetchSize();
}
/**
@ -377,7 +377,7 @@ abstract public class PrefetchSubscription extends AbstractSubscription{
}
protected synchronized void dispatchMatched() throws IOException{
if(!broker.isSlaveBroker()){
if(!isSlave()){
try{
int numberToDispatch=countBeforeFull();
if(numberToDispatch>0){
@ -412,7 +412,7 @@ abstract public class PrefetchSubscription extends AbstractSubscription{
return false;
}
// Make sure we can dispatch a message.
if(canDispatch(node)&&!isSlaveBroker()){
if(canDispatch(node)&&!isSlave()){
MessageDispatch md=createMessageDispatch(node,message);
// NULL messages don't count... they don't get Acked.
if(node!=QueueMessageReference.NULL_MESSAGE){

2
activemq-core/src/main/java/org/apache/activemq/broker/region/Subscription.java
View File

@ -111,7 +111,7 @@ public interface Subscription extends SubscriptionRecovery {
/**
* @return true if the broker is currently in slave mode
*/
boolean isSlaveBroker();
boolean isSlave();
/**
* @return number of messages pending delivery

2
activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
View File

@ -74,7 +74,7 @@ public class TopicSubscription extends AbstractSubscription{
public void add(MessageReference node) throws Exception{
enqueueCounter.incrementAndGet();
node.incrementReferenceCount();
if(!isFull()&&!isSlaveBroker()){
if(!isFull()&&!isSlave()){
optimizePrefetch();
// if maximumPendingMessages is set we will only discard messages which
// have not been dispatched (i.e. we allow the prefetch buffer to be filled)

2
activemq-core/src/main/java/org/apache/activemq/command/ConnectionInfo.java
View File

@ -36,7 +36,7 @@ public class ConnectionInfo extends BaseCommand {
protected BrokerId[] brokerPath;
protected boolean brokerMasterConnector;
protected boolean manageable;
protected boolean clientMaster;
protected boolean clientMaster=true;
protected transient Object transportContext;
public ConnectionInfo() {