SONAR-7908 rename property sonar.cluster.web.startupLeader

was sonar.cluster.startupLeader

diff --git a/it/it-tests/src/test/java/it/serverSystem/ClusterTest.java b/it/it-tests/src/test/java/it/serverSystem/ClusterTest.java
index 4655f9d72e0ea458b04f1accc3601b967d0e5f1f..2344cc663894a3ab87757fcd7f35a9bd8d3db87e 100644 (file)
--- a/it/it-tests/src/test/java/it/serverSystem/ClusterTest.java
+++ b/it/it-tests/src/test/java/it/serverSystem/ClusterTest.java
@@ -57,7 +57,7 @@ public class ClusterTest {
     // start "startup leader", which creates and populates datastores
     Orchestrator orchestrator = Orchestrator.builderEnv()
       .setServerProperty("sonar.cluster.enabled", "true")
-      .setServerProperty("sonar.cluster.startupLeader", "true")
+      .setServerProperty("sonar.cluster.web.startupLeader", "true")
       .setServerProperty("sonar.log.level", "TRACE")
       .addPlugin(ItUtils.xooPlugin())
       .build();
@@ -69,7 +69,7 @@ public class ClusterTest {
     assertThat(newWsClient(orchestrator).rules().search(new SearchWsRequest()).getTotal()).isGreaterThan(0);
 
     FileUtils.write(orchestrator.getServer().getLogs(), "", false);
-    updateSonarPropertiesFile(orchestrator, ImmutableMap.of("sonar.cluster.startupLeader", "false"));
+    updateSonarPropertiesFile(orchestrator, ImmutableMap.of("sonar.cluster.web.startupLeader", "false"));
     orchestrator.restartServer();
 
     expectLog(orchestrator, "Cluster enabled (startup follower)");
@@ -96,7 +96,7 @@ public class ClusterTest {
 
       web = Orchestrator.builderEnv()
         .setServerProperty("sonar.cluster.enabled", "true")
-        .setServerProperty("sonar.cluster.startupLeader", "true")
+        .setServerProperty("sonar.cluster.web.startupLeader", "true")
         .setServerProperty("sonar.cluster.search.disabled", "true")
         .setServerProperty("sonar.cluster.search.hosts", "localhost:" + esWatcher.port)
         // no need for compute engine in this test. Disable it for faster test.

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/cluster/ClusterProperties.java b/server/sonar-server/src/main/java/org/sonar/server/platform/cluster/ClusterProperties.java
index fe08773dd37fa4510f526cb481bda04faaa29e4f..24afe9697e70f2ecac8dda3b0001e30738573a28 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/cluster/ClusterProperties.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/cluster/ClusterProperties.java
@@ -27,7 +27,7 @@ import org.sonar.api.config.PropertyDefinition;
 public class ClusterProperties {
 
   public static final String ENABLED = "sonar.cluster.enabled";
-  public static final String STARTUP_LEADER = "sonar.cluster.startupLeader";
+  public static final String STARTUP_LEADER = "sonar.cluster.web.startupLeader";
 
   private ClusterProperties() {
     // only statics

diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/cluster/ClusterImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/cluster/ClusterImplTest.java
index a0378c3a4527be57b5413af5cda626855fbf12c8..e2f086eceb543e2569b617436937333d99f7197c 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/cluster/ClusterImplTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/platform/cluster/ClusterImplTest.java
@@ -45,7 +45,7 @@ public class ClusterImplTest {
   @Test
   public void node_is_startup_leader_in_cluster() {
     settings.setProperty("sonar.cluster.enabled", "true");
-    settings.setProperty("sonar.cluster.startupLeader", "true");
+    settings.setProperty("sonar.cluster.web.startupLeader", "true");
 
     ClusterImpl underTest = new ClusterImpl(settings);
 
@@ -66,7 +66,7 @@ public class ClusterImplTest {
   @Test
   public void node_is_startup_follower_in_cluster() {
     settings.setProperty("sonar.cluster.enabled", "true");
-    settings.setProperty("sonar.cluster.startupLeader", "false");
+    settings.setProperty("sonar.cluster.web.startupLeader", "false");
 
     ClusterImpl underTest = new ClusterImpl(settings);