You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2021/09/10 01:03:12 UTC
[brooklyn-server] 01/05: set default for auto to be HOT_STANDBY not
STANDBY
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit b52ecc3f32ff0e4e1b0d50b839ba27e1fc04b02b
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Sep 10 01:40:42 2021 +0100
set default for auto to be HOT_STANDBY not STANDBY
---
.../java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java | 2 +-
.../brooklyn/core/mgmt/ha/HighAvailabilityManagerTestFixture.java | 4 ++--
.../brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java | 6 ++++--
.../BrooklynLauncherRebindManagementNodeStateListenerTest.java | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java b/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
index 36cafcf..2991799 100644
--- a/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
+++ b/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
@@ -167,7 +167,7 @@ public class BrooklynFeatureEnablement {
setDefault(FEATURE_BUNDLE_PERSISTENCE_PROPERTY, true);
setDefault(FEATURE_CATALOG_PERSISTENCE_PROPERTY, true);
setDefault(FEATURE_REFERENCED_OBJECTS_REPERSISTENCE_PROPERTY, false);
- setDefault(FEATURE_DEFAULT_STANDBY_IS_HOT_PROPERTY, false);
+ setDefault(FEATURE_DEFAULT_STANDBY_IS_HOT_PROPERTY, true);
setDefault(FEATURE_PERSIST_ENTITY_SPEC_AS_SUPPLIER, true);
setDefault(FEATURE_RENAME_THREADS, false);
setDefault(FEATURE_JITTER_THREADS, false);
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerTestFixture.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerTestFixture.java
index ff02c1c..606e7e0 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerTestFixture.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerTestFixture.java
@@ -166,7 +166,7 @@ public abstract class HighAvailabilityManagerTestFixture {
// Expect to be notified of our promotion, as the only other node
promotionListener.assertCalledEventually();
- stateListener.assertCalledEventually(ManagementNodeState.INITIALIZING, ManagementNodeState.STANDBY, ManagementNodeState.MASTER);
+ stateListener.assertCalledEventually(ManagementNodeState.INITIALIZING, ManagementNodeState.STANDBY, ManagementNodeState.INITIALIZING, ManagementNodeState.HOT_STANDBY, ManagementNodeState.MASTER);
}
@Test(groups="Integration") // because one second wait in succeedsContinually
@@ -187,7 +187,7 @@ public abstract class HighAvailabilityManagerTestFixture {
@Override public void run() {
promotionListener.assertNotCalled();
}});
- stateListener.assertCalled(ManagementNodeState.INITIALIZING, ManagementNodeState.STANDBY);
+ stateListener.assertCalled(ManagementNodeState.INITIALIZING, ManagementNodeState.STANDBY, ManagementNodeState.INITIALIZING, ManagementNodeState.HOT_STANDBY);
}
@Test
diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java
index 441af8b..298eee2 100644
--- a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java
+++ b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherHighAvailabilityTest.java
@@ -79,7 +79,7 @@ public class BrooklynLauncherHighAvailabilityTest extends AbstractBrooklynLaunch
primaryManagementContext.getRebindManager().getPersister().waitForWritesCompleted(Asserts.DEFAULT_LONG_TIMEOUT);
// Secondary will come up as standby
- secondary = newLauncherForTests(PersistMode.AUTO, HighAvailabilityMode.AUTO)
+ secondary = newLauncherForTests(PersistMode.AUTO, HighAvailabilityMode.STANDBY)
.haHeartbeatTimeout(Duration.millis(1000))
.start();
ManagementContext secondaryManagementContext = secondary.getServerDetails().getManagementContext();
@@ -120,6 +120,7 @@ public class BrooklynLauncherHighAvailabilityTest extends AbstractBrooklynLaunch
assertOnlyAppEventually(tertiaryManagementContext, TestApplication.class);
}
+ @Test
public void testHighAvailabilityMasterModeFailsIfAlreadyHasMaster() throws Exception {
primary = newLauncherForTests(PersistMode.AUTO, HighAvailabilityMode.AUTO)
.start();
@@ -127,13 +128,14 @@ public class BrooklynLauncherHighAvailabilityTest extends AbstractBrooklynLaunch
try {
// Secondary will come up as standby
secondary = newLauncherForTests(PersistMode.AUTO, HighAvailabilityMode.MASTER)
+ .ignorePersistenceErrors(false)
.start();
Asserts.shouldHaveFailedPreviously();
} catch (IllegalStateException e) {
// success
}
}
-
+
@Test
public void testHighAvailabilityStandbyModeFailsIfNoExistingMaster() throws Exception {
try {
diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindManagementNodeStateListenerTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindManagementNodeStateListenerTest.java
index e417bbc..3501878 100644
--- a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindManagementNodeStateListenerTest.java
+++ b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindManagementNodeStateListenerTest.java
@@ -136,7 +136,7 @@ public class BrooklynLauncherRebindManagementNodeStateListenerTest extends Abstr
RecordingStaticManagementNodeStateListener.clearInstances();
// Start standby
- BrooklynLauncher launcher2 = newLauncherForTests(PersistMode.AUTO, HighAvailabilityMode.AUTO);
+ BrooklynLauncher launcher2 = newLauncherForTests(PersistMode.AUTO, HighAvailabilityMode.STANDBY);
launcher2.start();
RecordingStaticManagementNodeStateListener.getInstance().assertEventsEventually(ImmutableList.of(INITIALIZING, STANDBY));