Repository: activemq-artemis Updated Branches: refs/heads/master 2d3177a45 -> 852a5717a
ARTEMIS-269 - sett restartBackup to true by default https://issues.apache.org/jira/browse/ARTEMIS-269 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/31f23893 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/31f23893 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/31f23893 Branch: refs/heads/master Commit: 31f23893439541ddebc35fec193ee372d0d62aaa Parents: 2d3177a Author: Andy Taylor <[email protected]> Authored: Tue Oct 20 13:34:02 2015 +0100 Committer: Andy Taylor <[email protected]> Committed: Thu Oct 22 13:20:28 2015 +0100 ---------------------------------------------------------------------- .../activemq/artemis/api/config/ActiveMQDefaultConfiguration.java | 2 +- .../tests/integration/cluster/failover/FailoverTestBase.java | 1 + .../tests/integration/cluster/failover/ReplicatedFailoverTest.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/31f23893/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java index 3b739cc..7b27dcf 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java @@ -369,7 +369,7 @@ public final class ActiveMQDefaultConfiguration { private static int DEFAULT_MAX_SAVED_REPLICATED_JOURNALS_SIZE = 2; // Will this server, if a backup, restart once it has been stopped because of failback or scaling down. - private static boolean DEFAULT_RESTART_BACKUP = false; + private static boolean DEFAULT_RESTART_BACKUP = true; // Whether a server will automatically stop when another places a request to take over its place. The use case is when a regular server stops and its backup takes over its duties, later the main server restarts and requests the server (the former backup) to stop operating. private static boolean DEFAULT_ALLOW_AUTO_FAILBACK = true; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/31f23893/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java index 1dfc9d6..bb711ab 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java @@ -192,6 +192,7 @@ public abstract class FailoverTestBase extends ActiveMQTestBase { protected void setupHAPolicyConfiguration() { ((ReplicaPolicyConfiguration) backupConfig.getHAPolicyConfiguration()).setMaxSavedReplicatedJournalsSize(0).setAllowFailBack(true); + ((ReplicaPolicyConfiguration) backupConfig.getHAPolicyConfiguration()).setRestartBackup(false); } protected final void adaptLiveConfigForReplicatedFailBack(TestableServer server) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/31f23893/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedFailoverTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedFailoverTest.java index d846cc5..f03326e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedFailoverTest.java @@ -127,6 +127,7 @@ public class ReplicatedFailoverTest extends FailoverTest { if (isReplicatedFailbackTest) { ((ReplicatedPolicyConfiguration) liveConfig.getHAPolicyConfiguration()).setCheckForLiveServer(true); ((ReplicaPolicyConfiguration) backupConfig.getHAPolicyConfiguration()).setMaxSavedReplicatedJournalsSize(2).setAllowFailBack(true); + ((ReplicaPolicyConfiguration) backupConfig.getHAPolicyConfiguration()).setRestartBackup(false); } else { super.setupHAPolicyConfiguration();
