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

This closes #901

This commit is contained in:
Clebert Suconic 2016-11-29 09:47:03 -05:00
parent cf1c4d16c4 2d81f0a8d0
commit 5a9647cd76
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,7 @@ public class QuorumVoteServerConnect extends QuorumVote<BooleanVote, Boolean> {
@Override @Override
public void allVotesCast(Topology voteTopology) { public void allVotesCast(Topology voteTopology) {
latch.countDown();
} }
@Override @Override

16
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/SharedNothingBackupQuorum.java
View File

@ -21,7 +21,6 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
import org.apache.activemq.artemis.api.core.client.SessionFailureListener; import org.apache.activemq.artemis.api.core.client.SessionFailureListener;
import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
import org.apache.activemq.artemis.core.client.impl.Topology; import org.apache.activemq.artemis.core.client.impl.Topology;
@ -82,8 +81,6 @@ public class SharedNothingBackupQuorum implements Quorum, SessionFailureListener
*/ */
private static final int LATCH_TIMEOUT = 30; private static final int LATCH_TIMEOUT = 30;
private static final int RECONNECT_ATTEMPTS = 5;
private final Object decisionGuard = new Object(); private final Object decisionGuard = new Object();
@Override @Override
@ -101,14 +98,11 @@ public class SharedNothingBackupQuorum implements Quorum, SessionFailureListener
return; return;
} }
if (!isLiveDown()) { if (!isLiveDown()) {
try { //lost connection but don't know if live is down so restart as backup as we can't replicate any more
// no point in repeating all the reconnection logic signal = BACKUP_ACTIVATION.FAILURE_REPLICATING;
sessionFactory.connect(RECONNECT_ATTEMPTS, false); } else {
return; // live is assumed to be down, backup fails-over
} catch (ActiveMQException e) { signal = BACKUP_ACTIVATION.FAIL_OVER;
if (e.getType() != ActiveMQExceptionType.NOT_CONNECTED)
ActiveMQServerLogger.LOGGER.errorReConnecting(e);
}
} }
if (networkHealthCheck != null && networkHealthCheck.check()) { if (networkHealthCheck != null && networkHealthCheck.check()) {