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

ARTEMIS-1866 Fixing QuorumResultWaitTest

This commit is contained in:
Clebert Suconic 2018-07-10 21:59:30 -04:00
parent 8989da1a6a
commit 048f46bd4f
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ReplicatedPolicyConfiguration.java
View File

@ -79,24 +79,27 @@ public class ReplicatedPolicyConfiguration implements HAPolicyConfiguration {
return initialReplicationSyncTimeout; return initialReplicationSyncTimeout;
} }
public void setInitialReplicationSyncTimeout(long initialReplicationSyncTimeout) { public ReplicatedPolicyConfiguration setInitialReplicationSyncTimeout(long initialReplicationSyncTimeout) {
this.initialReplicationSyncTimeout = initialReplicationSyncTimeout; this.initialReplicationSyncTimeout = initialReplicationSyncTimeout;
return this;
} }
public boolean getVoteOnReplicationFailure() { public boolean getVoteOnReplicationFailure() {
return voteOnReplicationFailure; return voteOnReplicationFailure;
} }
public void setVoteOnReplicationFailure(boolean voteOnReplicationFailure) { public ReplicatedPolicyConfiguration setVoteOnReplicationFailure(boolean voteOnReplicationFailure) {
this.voteOnReplicationFailure = voteOnReplicationFailure; this.voteOnReplicationFailure = voteOnReplicationFailure;
return this;
} }
public int getQuorumSize() { public int getQuorumSize() {
return quorumSize; return quorumSize;
} }
public void setQuorumSize(int quorumSize) { public ReplicatedPolicyConfiguration setQuorumSize(int quorumSize) {
this.quorumSize = quorumSize; this.quorumSize = quorumSize;
return this;
} }
@ -104,12 +107,14 @@ public class ReplicatedPolicyConfiguration implements HAPolicyConfiguration {
return voteRetries; return voteRetries;
} }
public void setVoteRetries(int voteRetries) { public ReplicatedPolicyConfiguration setVoteRetries(int voteRetries) {
this.voteRetries = voteRetries; this.voteRetries = voteRetries;
return this;
} }
public void setVoteRetryWait(long voteRetryWait) { public ReplicatedPolicyConfiguration setVoteRetryWait(long voteRetryWait) {
this.voteRetryWait = voteRetryWait; this.voteRetryWait = voteRetryWait;
return this;
} }
public long getVoteRetryWait() { public long getVoteRetryWait() {
@ -120,7 +125,9 @@ public class ReplicatedPolicyConfiguration implements HAPolicyConfiguration {
return quorumVoteWait; return quorumVoteWait;
} }
public void setQuorumVoteWait(int quorumVoteWait) { public ReplicatedPolicyConfiguration setQuorumVoteWait(int quorumVoteWait) {
new Exception("here").printStackTrace();
this.quorumVoteWait = quorumVoteWait; this.quorumVoteWait = quorumVoteWait;
return this;
} }
} }

19
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/QuorumResultWaitTest.java
View File

@ -21,6 +21,7 @@ import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration; import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration;
import org.apache.activemq.artemis.core.server.cluster.ha.ReplicatedPolicy; import org.apache.activemq.artemis.core.server.cluster.ha.ReplicatedPolicy;
import org.junit.Test; import org.junit.Test;
public class QuorumResultWaitTest extends StaticClusterWithBackupFailoverTest { public class QuorumResultWaitTest extends StaticClusterWithBackupFailoverTest {
public static final int QUORUM_VOTE_WAIT_CONFIGURED_TIME_SEC = 12; public static final int QUORUM_VOTE_WAIT_CONFIGURED_TIME_SEC = 12;
@ -33,7 +34,7 @@ public class QuorumResultWaitTest extends StaticClusterWithBackupFailoverTest {
((ReplicatedPolicyConfiguration) servers[2].getConfiguration().getHAPolicyConfiguration()).setGroupName("group2"); ((ReplicatedPolicyConfiguration) servers[2].getConfiguration().getHAPolicyConfiguration()).setGroupName("group2");
((ReplicaPolicyConfiguration) servers[4].getConfiguration().getHAPolicyConfiguration()).setGroupName("group1"); ((ReplicaPolicyConfiguration) servers[4].getConfiguration().getHAPolicyConfiguration()).setGroupName("group1");
((ReplicaPolicyConfiguration) servers[5].getConfiguration().getHAPolicyConfiguration()).setGroupName("group2"); ((ReplicaPolicyConfiguration) servers[5].getConfiguration().getHAPolicyConfiguration()).setGroupName("group2");
ReplicatedPolicyConfiguration replicatedPolicyConf = new ReplicatedPolicyConfiguration(); ReplicatedPolicyConfiguration replicatedPolicyConf = new ReplicatedPolicyConfiguration().setQuorumVoteWait(QUORUM_VOTE_WAIT_CONFIGURED_TIME_SEC);
replicatedPolicyConf.setGroupName("group0"); replicatedPolicyConf.setGroupName("group0");
replicatedPolicyConf.setVoteRetries(5); replicatedPolicyConf.setVoteRetries(5);
replicatedPolicyConf.setVoteRetryWait(100); replicatedPolicyConf.setVoteRetryWait(100);
@ -43,12 +44,16 @@ public class QuorumResultWaitTest extends StaticClusterWithBackupFailoverTest {
@Test @Test
public void testQuorumVotingResultWait() throws Exception { public void testQuorumVotingResultWait() throws Exception {
setupCluster(); setupCluster();
startServers(0, 1, 2); try {
startServers(3, 4, 5); startServers(0, 1, 2);
//Assert if the default time 30 sec is used startServers(3, 4, 5);
assertEquals(ActiveMQDefaultConfiguration.getDefaultQuorumVoteWait(), ((ReplicatedPolicy)(servers[0].getHAPolicy())).getQuorumVoteWait()); //Assert if the default time 30 sec is used
//Assert if the configured time is used. assertEquals(ActiveMQDefaultConfiguration.getDefaultQuorumVoteWait(), ((ReplicatedPolicy) (servers[0].getHAPolicy())).getQuorumVoteWait());
assertEquals(QUORUM_VOTE_WAIT_CONFIGURED_TIME_SEC, ((ReplicatedPolicy)(servers[3].getHAPolicy())).getQuorumVoteWait()); //Assert if the configured time is used.
assertEquals(QUORUM_VOTE_WAIT_CONFIGURED_TIME_SEC, ((ReplicatedPolicy) (servers[3].getHAPolicy())).getQuorumVoteWait());
} finally {
stopServers(0, 1, 2, 3, 4, 5);
}
} }
@Override @Override