You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2020/04/15 21:35:44 UTC
[activemq-artemis] branch master updated: ARTEMIS-2715 master
broker created w/--replicated should use vote-on-replication-failure=true
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new 35e0ab6 ARTEMIS-2715 master broker created w/--replicated should use vote-on-replication-failure=true
new ae33b77 This closes #3086
35e0ab6 is described below
commit 35e0ab63cd216a6684765b6379c837a64971353d
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Wed Apr 15 14:33:37 2020 -0500
ARTEMIS-2715 master broker created w/--replicated should use vote-on-replication-failure=true
---
.../java/org/apache/activemq/artemis/cli/commands/Create.java | 5 +++--
.../artemis/cli/commands/etc/replicated-master-settings.txt | 8 ++++++++
.../{replicated-settings.txt => replicated-slave-settings.txt} | 2 +-
.../java/org/apache/activemq/cli/test/StreamClassPathTest.java | 4 ++--
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index 6e05e9b..2c56c35 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -91,7 +91,8 @@ public class Create extends InputAbstract {
private static final String ETC_LOGIN_CONFIG = "login.config";
private static final String ETC_LOGIN_CONFIG_WITH_GUEST = "etc/login-with-guest.config";
private static final String ETC_LOGIN_CONFIG_WITHOUT_GUEST = "etc/login-without-guest.config";
- public static final String ETC_REPLICATED_SETTINGS_TXT = "etc/replicated-settings.txt";
+ public static final String ETC_REPLICATED_MASTER_SETTINGS_TXT = "etc/replicated-master-settings.txt";
+ public static final String ETC_REPLICATED_SLAVE_SETTINGS_TXT = "etc/replicated-slave-settings.txt";
public static final String ETC_SHARED_STORE_SETTINGS_TXT = "etc/shared-store-settings.txt";
public static final String ETC_CLUSTER_SECURITY_SETTINGS_TXT = "etc/cluster-security-settings.txt";
public static final String ETC_CLUSTER_SETTINGS_TXT = "etc/cluster-settings.txt";
@@ -590,7 +591,7 @@ public class Create extends InputAbstract {
if (replicated) {
clustered = true;
- filters.put("${replicated.settings}", readTextFile(ETC_REPLICATED_SETTINGS_TXT, filters));
+ filters.put("${replicated.settings}", readTextFile(isSlave() ? ETC_REPLICATED_SLAVE_SETTINGS_TXT : ETC_REPLICATED_MASTER_SETTINGS_TXT, filters));
} else {
filters.put("${replicated.settings}", "");
}
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/replicated-master-settings.txt b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/replicated-master-settings.txt
new file mode 100644
index 0000000..295788b
--- /dev/null
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/replicated-master-settings.txt
@@ -0,0 +1,8 @@
+
+ <ha-policy>
+ <replication>
+ <master>
+ <vote-on-replication-failure>true</vote-on-replication-failure>
+ </master>
+ </replication>
+ </ha-policy>
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/replicated-settings.txt b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/replicated-slave-settings.txt
similarity index 73%
rename from artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/replicated-settings.txt
rename to artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/replicated-slave-settings.txt
index 17a2bc3..b97b837 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/replicated-settings.txt
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/replicated-slave-settings.txt
@@ -1,6 +1,6 @@
<ha-policy>
<replication>
- <${master-slave}/>
+ <slave/>
</replication>
</ha-policy>
diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/StreamClassPathTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/StreamClassPathTest.java
index a950ac1..0aae575 100644
--- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/StreamClassPathTest.java
+++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/StreamClassPathTest.java
@@ -44,8 +44,8 @@ public class StreamClassPathTest {
testStream(Create.class, "etc/" + Create.ETC_BROKER_XML);
testStream(Create.class, "etc/" + Create.ETC_ARTEMIS_ROLES_PROPERTIES);
testStream(Create.class, "etc/" + Create.ETC_ARTEMIS_USERS_PROPERTIES);
- testStream(Create.class, Create.ETC_REPLICATED_SETTINGS_TXT);
- testStream(Create.class, Create.ETC_REPLICATED_SETTINGS_TXT);
+ testStream(Create.class, Create.ETC_REPLICATED_MASTER_SETTINGS_TXT);
+ testStream(Create.class, Create.ETC_REPLICATED_SLAVE_SETTINGS_TXT);
testStream(Create.class, Create.ETC_SHARED_STORE_SETTINGS_TXT);
testStream(Create.class, Create.ETC_CLUSTER_SECURITY_SETTINGS_TXT);
testStream(Create.class, Create.ETC_CLUSTER_SETTINGS_TXT);