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

ARTEMIS-179 fix scale-down

This commit is contained in:
jbertram 2015-08-06 16:28:56 -05:00
parent 682cad63f3
commit 3bb88c60ca
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
View File

@ -579,7 +579,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
sessionsToClose = new HashSet<ClientSessionInternal>(sessions); sessionsToClose = new HashSet<ClientSessionInternal>(sessions);
} }
callFailoverListeners(FailoverEventType.FAILOVER_FAILED); callFailoverListeners(FailoverEventType.FAILOVER_FAILED);
callSessionFailureListeners(me, true, false); callSessionFailureListeners(me, true, false, scaleDownTargetNodeID);
} }
} }
finally { finally {

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
View File

@ -565,7 +565,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
catch (Throwable dontCare) { catch (Throwable dontCare) {
} }
if (scaleDownTargetNodeID != null && !scaleDownTargetNodeID.equals(nodeUUID)) { if (scaleDownTargetNodeID != null && !scaleDownTargetNodeID.equals(nodeUUID.toString())) {
synchronized (this) { synchronized (this) {
try { try {
ActiveMQServerLogger.LOGGER.debug("Moving " + queue.getMessageCount() + " messages from " + queue.getName() + " to " + scaleDownTargetNodeID); ActiveMQServerLogger.LOGGER.debug("Moving " + queue.getMessageCount() + " messages from " + queue.getName() + " to " + scaleDownTargetNodeID);