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-4621 

Improve logging and configuration
This commit is contained in:
Timothy Bish 2013-09-11 14:24:29 -04:00
parent 77bcffc9b9
commit 8f8aa0f5e2
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowAckConsumerStrategy.java
View File

@ -104,23 +104,19 @@ public class AbortSlowAckConsumerStrategy extends AbortSlowConsumerStrategy {
private void updateSlowConsumersList(List<Subscription> subscribers) { private void updateSlowConsumersList(List<Subscription> subscribers) {
for (Subscription subscriber : subscribers) { for (Subscription subscriber : subscribers) {
if (subscriber.getConsumerInfo().isNetworkSubscription()) { if (isIgnoreNetworkSubscriptions() && subscriber.getConsumerInfo().isNetworkSubscription()) {
if (slowConsumers.remove(subscriber) != null) { if (slowConsumers.remove(subscriber) != null) {
LOG.info("sub: {} is no longer slow", subscriber.getConsumerInfo().getConsumerId()); LOG.info("network sub: {} is no longer slow", subscriber.getConsumerInfo().getConsumerId());
continue;
} }
continue;
} }
if (isIgnoreIdleConsumers() && subscriber.getDispatchedQueueSize() == 0) { if (isIgnoreIdleConsumers() && subscriber.getDispatchedQueueSize() == 0) {
// Not considered Idle so ensure its cleared from the list // Not considered Idle so ensure its cleared from the list
if (slowConsumers.remove(subscriber) != null) { if (slowConsumers.remove(subscriber) != null) {
LOG.info("sub: {} is no longer slow", subscriber.getConsumerInfo().getConsumerId()); LOG.info("idle sub: {} is no longer slow", subscriber.getConsumerInfo().getConsumerId());
}
continue; continue;
} else {
if (LOG.isTraceEnabled()) {
LOG.trace("Not ignoring idle Consumer {}", subscriber.getConsumerInfo().getConsumerId());
}
}
} }
long lastAckTime = subscriber.getTimeOfLastMessageAck(); long lastAckTime = subscriber.getTimeOfLastMessageAck();
@ -146,12 +142,11 @@ public class AbortSlowAckConsumerStrategy extends AbortSlowConsumerStrategy {
private void abortAllQualifiedSlowConsumers() { private void abortAllQualifiedSlowConsumers() {
HashMap<Subscription, SlowConsumerEntry> toAbort = new HashMap<Subscription, SlowConsumerEntry>(); HashMap<Subscription, SlowConsumerEntry> toAbort = new HashMap<Subscription, SlowConsumerEntry>();
for (Entry<Subscription, SlowConsumerEntry> entry : slowConsumers.entrySet()) { for (Entry<Subscription, SlowConsumerEntry> entry : slowConsumers.entrySet()) {
if (getMaxSlowDuration() > 0 && if (getMaxSlowDuration() > 0 && (entry.getValue().markCount * getCheckPeriod() > getMaxSlowDuration()) ||
(entry.getValue().markCount * getCheckPeriod() > getMaxSlowDuration()) ||
getMaxSlowCount() > 0 && entry.getValue().slowCount > getMaxSlowCount()) { getMaxSlowCount() > 0 && entry.getValue().slowCount > getMaxSlowCount()) {
if (LOG.isTraceEnabled()) { if (LOG.isTraceEnabled()) {
LOG.trace("Remove consumer {} from slow list: " + LOG.trace("Transferring consumer {} to the abort list: " +
"slow duration = " + entry.getValue().markCount * getCheckPeriod() + ", " + "slow duration = " + entry.getValue().markCount * getCheckPeriod() + ", " +
"slow count = " + entry.getValue().slowCount, "slow count = " + entry.getValue().slowCount,
entry.getKey().getConsumerInfo().getConsumerId()); entry.getKey().getConsumerInfo().getConsumerId());