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

https://issues.apache.org/jira/browse/AMQ-3253 - Support Temporary Destinations in a network without advisories. Allow gc of regular destinations that have just network consumers, hub/spoke case with dynamic real reply destinations. policy entry: GcWithNetworkConsumers now applicable to all destinations. addition to https://issues.apache.org/jira/browse/AMQ-2571 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1088557 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2011-04-04 11:11:36 +00:00
parent 254d9209f5
commit d55a3922c9
5 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
activemq-core/src/main/java/org/apache/activemq/broker/region/BaseDestination.java
View File

@ -18,6 +18,7 @@ package org.apache.activemq.broker.region;
import java.io.IOException;
import java.util.Collection;
import java.util.List;
import javax.jms.ResourceAllocationException;
import org.apache.activemq.advisory.AdvisorySupport;
import org.apache.activemq.broker.Broker;
@ -89,6 +90,7 @@ public abstract class BaseDestination implements Destination {
private boolean prioritizedMessages;
private long inactiveTimoutBeforeGC = DEFAULT_INACTIVE_TIMEOUT_BEFORE_GC;
private boolean gcIfInactive;
private boolean gcWithNetworkConsumers;
private long lastActiveTime=0l;
private boolean reduceMemoryFootprint = false;
@ -243,7 +245,12 @@ public abstract class BaseDestination implements Destination {
}
public boolean isActive() {
return destinationStatistics.getConsumers().getCount() != 0 || destinationStatistics.getProducers().getCount() != 0;
boolean isActive = destinationStatistics.getConsumers().getCount() != 0 ||
destinationStatistics.getProducers().getCount() != 0;
if (isActive && isGcWithNetworkConsumers() && destinationStatistics.getConsumers().getCount() != 0) {
isActive = hasRegularConsumers(getConsumers());
}
return isActive;
}
public int getMaxPageSize() {
@ -650,7 +657,19 @@ public abstract class BaseDestination implements Destination {
public void setGcIfInactive(boolean gcIfInactive) {
this.gcIfInactive = gcIfInactive;
}
/**
* Indicate if it is ok to gc destinations that have only network consumers
* @param gcWithNetworkConsumers
*/
public void setGcWithNetworkConsumers(boolean gcWithNetworkConsumers) {
this.gcWithNetworkConsumers = gcWithNetworkConsumers;
}
public boolean isGcWithNetworkConsumers() {
return gcWithNetworkConsumers;
}
public void markForGC(long timeStamp) {
if (isGcIfInactive() && this.lastActiveTime == 0 && isActive() == false
&& destinationStatistics.messages.getCount() == 0 && getInactiveTimoutBeforeGC() > 0l) {
@ -676,7 +695,9 @@ public abstract class BaseDestination implements Destination {
return this.reduceMemoryFootprint;
}
protected boolean hasRegularConsumers(Collection<Subscription> consumers) {
public abstract List<Subscription> getConsumers();
protected boolean hasRegularConsumers(List<Subscription> consumers) {
boolean hasRegularConsumers = false;
for (Subscription subscription: consumers) {
if (!subscription.getConsumerInfo().isNetworkSubscription()) {

11
activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueue.java
View File

@ -90,15 +90,4 @@ public class TempQueue extends Queue{
}
super.dispose(context);
}
@Override
public boolean isActive() {
boolean isActive = super.isActive();
if (isActive && brokerService.isAllowTempAutoCreationOnSend()) {
synchronized (consumers) {
isActive = hasRegularConsumers(consumers);
}
}
return isActive;
}
}

11
activemq-core/src/main/java/org/apache/activemq/broker/region/TempTopic.java
View File

@ -68,15 +68,4 @@ public class TempTopic extends Topic implements Task{
public void initialize() {
}
@Override
public boolean isActive() {
boolean isActive = super.isActive();
if (isActive && brokerService.isAllowTempAutoCreationOnSend()) {
synchronized (consumers) {
isActive = hasRegularConsumers(consumers);
}
}
return isActive;
}
}

16
activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java
View File

@ -90,10 +90,11 @@ public class PolicyEntry extends DestinationMapEntry {
private boolean prioritizedMessages;
private boolean allConsumersExclusiveByDefault;
private boolean gcInactiveDestinations;
private boolean gcWithNetworkConsumers;
private long inactiveTimoutBeforeGC = BaseDestination.DEFAULT_INACTIVE_TIMEOUT_BEFORE_GC;
private boolean reduceMemoryFootprint;
public void configure(Broker broker,Queue queue) {
baseConfiguration(broker,queue);
if (dispatchPolicy != null) {
@ -163,6 +164,7 @@ public class PolicyEntry extends DestinationMapEntry {
destination.setSlowConsumerStrategy(scs);
destination.setPrioritizedMessages(isPrioritizedMessages());
destination.setGcIfInactive(isGcInactiveDestinations());
destination.setGcWithNetworkConsumers(isGcWithNetworkConsumers());
destination.setInactiveTimoutBeforeGC(getInactiveTimoutBeforeGC());
destination.setReduceMemoryFootprint(isReduceMemoryFootprint());
}
@ -787,7 +789,15 @@ public class PolicyEntry extends DestinationMapEntry {
public void setInactiveTimoutBeforeGC(long inactiveTimoutBeforeGC) {
this.inactiveTimoutBeforeGC = inactiveTimoutBeforeGC;
}
public void setGcWithNetworkConsumers(boolean gcWithNetworkConsumers) {
this.gcWithNetworkConsumers = gcWithNetworkConsumers;
}
public boolean isGcWithNetworkConsumers() {
return gcWithNetworkConsumers;
}
public boolean isReduceMemoryFootprint() {
return reduceMemoryFootprint;
}

1
activemq-core/src/test/java/org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.java
View File

@ -264,6 +264,7 @@ public class RequestReplyNoAdvisoryNetworkTest extends JmsMultipleBrokersTestSup
PolicyEntry tempReplyQPolicy = new PolicyEntry();
tempReplyQPolicy.setOptimizedDispatch(true);
tempReplyQPolicy.setGcInactiveDestinations(true);
tempReplyQPolicy.setGcWithNetworkConsumers(true);
tempReplyQPolicy.setInactiveTimoutBeforeGC(10*1000);
map.put(replyQWildcard, tempReplyQPolicy);
broker.setDestinationPolicy(map);