From 8e97c4683e01a64398fcd8d7046c6dd8dd3f45c6 Mon Sep 17 00:00:00 2001 From: Tor Brede Vekterli Date: Tue, 19 Mar 2019 14:26:38 +0100 Subject: Explicitly enable two-phase transitions in tests, disable in default options Mirrors the default values in the actual underlying config definitions. --- .../vespa/clustercontroller/core/DatabaseTest.java | 4 +- .../core/DistributionBitCountTest.java | 2 +- .../core/FleetControllerTest.java | 12 ++++++ .../core/GroupAutoTakedownLiveConfigTest.java | 2 +- .../clustercontroller/core/MasterElectionTest.java | 20 ++++----- .../clustercontroller/core/NoZooKeeperTest.java | 2 +- .../NodeSlobrokConfigurationMembershipTest.java | 2 +- .../clustercontroller/core/RpcServerTest.java | 30 +++++++------- .../core/RpcVersionAutoDowngradeTest.java | 2 +- .../vespa/clustercontroller/core/SlobrokTest.java | 4 +- .../clustercontroller/core/StateChangeTest.java | 48 +++++++++++----------- .../clustercontroller/core/StateGatherTest.java | 2 +- .../clustercontroller/core/StatusPagesTest.java | 12 +++--- .../core/SystemStateBroadcasterTest.java | 2 - .../clustercontroller/core/WantedStateTest.java | 4 +- 15 files changed, 79 insertions(+), 69 deletions(-) (limited to 'clustercontroller-core/src/test/java/com') diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java index e54a333a15e..27dcd009c96 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java @@ -49,7 +49,7 @@ public class DatabaseTest extends FleetControllerTest { @Test public void testWantedStatesInZooKeeper() throws Exception { startingTest("DatabaseTest::testWantedStatesInZooKeeper"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.zooKeeperServerAddress = "127.0.0.1"; setUpFleetController(true, options); setUpVdsNodes(true, new DummyVdsNodeOptions()); @@ -105,7 +105,7 @@ public class DatabaseTest extends FleetControllerTest { @Test public void testWantedStateOfUnknownNode() throws Exception { startingTest("DatabaseTest::testWantedStatesOfUnknownNode"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.minRatioOfDistributorNodesUp = 0; options.minRatioOfStorageNodesUp = 0; options.zooKeeperServerAddress = "localhost"; diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java index ae59336b5ef..77164b678c6 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java @@ -20,7 +20,7 @@ public class DistributionBitCountTest extends FleetControllerTest { for (int i = 0 ; i < 10; i++) { configuredNodes.add(new ConfiguredNode(i, false)); } - FleetControllerOptions options = new FleetControllerOptions("mycluster", configuredNodes); + FleetControllerOptions options = defaultOptions("mycluster", configuredNodes); options.distributionBits = 17; setUpFleetController(false, options); startingTest(testName); diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java index 21d9b0a7a1f..5ecc33ae964 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java @@ -119,6 +119,18 @@ public abstract class FleetControllerTest implements Waiter { testName = name; } + static protected FleetControllerOptions defaultOptions(String clusterName) { + var opts = new FleetControllerOptions(clusterName); + opts.enableTwoPhaseClusterStateActivation = true; // Enable by default, tests can explicitly disable. + return opts; + } + + static protected FleetControllerOptions defaultOptions(String clusterName, Collection nodes) { + var opts = new FleetControllerOptions(clusterName, nodes); + opts.enableTwoPhaseClusterStateActivation = true; // Enable by default, tests can explicitly disable. + return opts; + } + protected void setUpSystem(boolean useFakeTimer, FleetControllerOptions options) throws Exception { log.log(LogLevel.DEBUG, "Setting up system"); slobrok = new Slobrok(); diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/GroupAutoTakedownLiveConfigTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/GroupAutoTakedownLiveConfigTest.java index 4a3eef559aa..4805257ea7a 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/GroupAutoTakedownLiveConfigTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/GroupAutoTakedownLiveConfigTest.java @@ -18,7 +18,7 @@ public class GroupAutoTakedownLiveConfigTest extends FleetControllerTest { private static FleetControllerOptions createOptions( DistributionBuilder.GroupBuilder groupBuilder, double minNodeRatio) { - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.setStorageDistribution(DistributionBuilder.forHierarchicCluster(groupBuilder)); options.nodes = DistributionBuilder.buildConfiguredNodes(groupBuilder.totalNodeCount()) .stream().collect(Collectors.toSet()); diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java index 9d6e39f244a..23389de3fad 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java @@ -119,7 +119,7 @@ public class MasterElectionTest extends FleetControllerTest { public void testMasterElection() throws Exception { startingTest("MasterElectionTest::testMasterElection"); log.log(LogLevel.INFO, "STARTING TEST: MasterElectionTest::testMasterElection()"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.masterZooKeeperCooldownPeriod = 1; setUpFleetController(5, true, options); waitForMaster(0); @@ -223,7 +223,7 @@ public class MasterElectionTest extends FleetControllerTest { @Test public void testClusterStateVersionIncreasesAcrossMasterElections() throws Exception { startingTest("MasterElectionTest::testClusterStateVersionIncreasesAcrossMasterElections"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.masterZooKeeperCooldownPeriod = 1; setUpFleetController(5, true, options); // Currently need to have content nodes present for the cluster controller to even bother @@ -248,7 +248,7 @@ public class MasterElectionTest extends FleetControllerTest { @Test public void testVotingCorrectnessInFaceOfZKDisconnect() throws Exception { startingTest("MasterElectionTest::testVotingCorrectnessInFaceOfZKDisconnect"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); // "Magic" port value is in range allocated to module for testing. zooKeeperServer = ZooKeeperTestServer.createWithFixedPort(18342); options.zooKeeperSessionTimeout = 100; @@ -272,7 +272,7 @@ public class MasterElectionTest extends FleetControllerTest { @Test public void testZooKeeperUnavailable() throws Exception { startingTest("MasterElectionTest::testZooKeeperUnavailable"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.zooKeeperSessionTimeout = 100; options.masterZooKeeperCooldownPeriod = 100; options.zooKeeperServerAddress = "localhost"; @@ -308,7 +308,7 @@ public class MasterElectionTest extends FleetControllerTest { @Ignore public void testMasterZooKeeperCooldown() throws Exception { startingTest("MasterElectionTest::testMasterZooKeeperCooldown"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.masterZooKeeperCooldownPeriod = 3600 * 1000; // An hour setUpFleetController(3, true, options); waitForMaster(0); @@ -349,7 +349,7 @@ public class MasterElectionTest extends FleetControllerTest { @Ignore public void testGetMaster() throws Exception { startingTest("MasterElectionTest::testGetMaster"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.masterZooKeeperCooldownPeriod = 3600 * 1000; // An hour setUpFleetController(3, true, options); waitForMaster(0); @@ -429,7 +429,7 @@ public class MasterElectionTest extends FleetControllerTest { @Test public void testReconfigure() throws Exception { startingTest("MasterElectionTest::testReconfigure"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.masterZooKeeperCooldownPeriod = 1; setUpFleetController(3, true, options); waitForMaster(0); @@ -454,7 +454,7 @@ public class MasterElectionTest extends FleetControllerTest { @Test public void cluster_state_version_written_to_zookeeper_even_with_empty_send_set() throws Exception { startingTest("MasterElectionTest::cluster_state_version_written_to_zookeeper_even_with_empty_send_set"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.masterZooKeeperCooldownPeriod = 1; options.minRatioOfDistributorNodesUp = 0; options.minRatioOfStorageNodesUp = 0; @@ -500,7 +500,7 @@ public class MasterElectionTest extends FleetControllerTest { @Test public void previously_published_state_is_taken_into_account_for_default_space_when_controller_bootstraps() throws Exception { startingTest("MasterElectionTest::previously_published_state_is_taken_into_account_for_default_space_when_controller_bootstraps"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.clusterHasGlobalDocumentTypes = true; options.masterZooKeeperCooldownPeriod = 1; options.minTimeBeforeFirstSystemStateBroadcast = 100000; @@ -543,7 +543,7 @@ public class MasterElectionTest extends FleetControllerTest { @Test public void default_space_nodes_not_marked_as_maintenance_when_cluster_has_no_global_document_types() throws Exception { startingTest("MasterElectionTest::default_space_nodes_not_marked_as_maintenance_when_cluster_has_no_global_document_types"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.clusterHasGlobalDocumentTypes = false; options.masterZooKeeperCooldownPeriod = 1; options.minTimeBeforeFirstSystemStateBroadcast = 100000; diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NoZooKeeperTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NoZooKeeperTest.java index 22831a04527..dff33d7a6fc 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NoZooKeeperTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NoZooKeeperTest.java @@ -9,7 +9,7 @@ public class NoZooKeeperTest extends FleetControllerTest { @Test public void testWantedStatesInZooKeeper() throws Exception { startingTest("NoZooKeeperTest::testWantedStatesInZooKeeper"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.zooKeeperServerAddress = null; setUpFleetController(true, options); setUpVdsNodes(true, new DummyVdsNodeOptions()); diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeSlobrokConfigurationMembershipTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeSlobrokConfigurationMembershipTest.java index a2b21f10741..9003e369b59 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeSlobrokConfigurationMembershipTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeSlobrokConfigurationMembershipTest.java @@ -28,7 +28,7 @@ public class NodeSlobrokConfigurationMembershipTest extends FleetControllerTest } private FleetControllerOptions optionsForConfiguredNodes(Set configuredNodes) { - FleetControllerOptions options = new FleetControllerOptions("mycluster", configuredNodes); + FleetControllerOptions options = defaultOptions("mycluster", configuredNodes); options.maxSlobrokDisconnectGracePeriod = 60 * 1000; options.nodeStateRequestTimeoutMS = 10000 * 60 * 1000; options.maxTransitionTime = transitionTimes(0); diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java index fadafdc7d32..214ccfa1c5b 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java @@ -85,7 +85,7 @@ public class RpcServerTest extends FleetControllerTest { public void testFailOccasionallyAndIgnoreToSeeIfOtherTestsThenWork() { try{ startingTest("RpcServerTest::testFailOccasionallyAndIgnoreToSeeIfOtherTestsThenWork"); - setUpFleetController(true, new FleetControllerOptions("mycluster")); + setUpFleetController(true, defaultOptions("mycluster")); setUpVdsNodes(true, new DummyVdsNodeOptions()); waitForStableSystem(); } catch (Throwable t) {} @@ -95,7 +95,7 @@ public class RpcServerTest extends FleetControllerTest { public void testGetSystemState() throws Exception { LogFormatter.initializeLogging(); startingTest("RpcServerTest::testGetSystemState"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); setUpFleetController(true, options); setUpVdsNodes(true, new DummyVdsNodeOptions()); waitForStableSystem(); @@ -165,7 +165,7 @@ public class RpcServerTest extends FleetControllerTest { Set configuredNodes = new TreeSet<>(); for (int i = 0; i < 10; i++) configuredNodes.add(new ConfiguredNode(i, false)); - FleetControllerOptions options = new FleetControllerOptions("mycluster", configuredNodes); + FleetControllerOptions options = defaultOptions("mycluster", configuredNodes); options.minRatioOfStorageNodesUp = 0; options.maxInitProgressTime = 30000; options.stableStateTimePeriod = 60000; @@ -284,7 +284,7 @@ public class RpcServerTest extends FleetControllerTest { for (int i = 0; i < 9; i++) configuredNodes.add(new ConfiguredNode(i, false)); configuredNodes.add(new ConfiguredNode(9, true)); // Last node is configured retired - FleetControllerOptions options = new FleetControllerOptions("mycluster", configuredNodes); + FleetControllerOptions options = defaultOptions("mycluster", configuredNodes); options.minRatioOfStorageNodesUp = 0; options.maxInitProgressTime = 30000; options.stableStateTimePeriod = 60000; @@ -319,7 +319,7 @@ public class RpcServerTest extends FleetControllerTest { List configuredNodes = new ArrayList<>(); for (int i = 0; i < 5; i++) configuredNodes.add(new ConfiguredNode(i, false)); - FleetControllerOptions options = new FleetControllerOptions("mycluster", configuredNodes); + FleetControllerOptions options = defaultOptions("mycluster", configuredNodes); options.maxInitProgressTime = 30000; options.stableStateTimePeriod = 60000; setUpFleetController(true, options); @@ -343,7 +343,7 @@ public class RpcServerTest extends FleetControllerTest { configuredNodes.add(new ConfiguredNode(i, true)); configuredNodes.add(new ConfiguredNode(5, false)); configuredNodes.add(new ConfiguredNode(6, false)); - FleetControllerOptions options = new FleetControllerOptions("mycluster", configuredNodes); + FleetControllerOptions options = defaultOptions("mycluster", configuredNodes); options.slobrokConnectionSpecs = this.options.slobrokConnectionSpecs; this.options.maxInitProgressTime = 30000; this.options.stableStateTimePeriod = 60000; @@ -373,7 +373,7 @@ public class RpcServerTest extends FleetControllerTest { Set configuredNodes = new TreeSet<>(); for (int i = 0; i < 7; i++) configuredNodes.add(new ConfiguredNode(i, false)); - FleetControllerOptions options = new FleetControllerOptions("mycluster", configuredNodes); + FleetControllerOptions options = defaultOptions("mycluster", configuredNodes); options.slobrokConnectionSpecs = this.options.slobrokConnectionSpecs; this.options.maxInitProgressTime = 30000; this.options.stableStateTimePeriod = 60000; @@ -400,7 +400,7 @@ public class RpcServerTest extends FleetControllerTest { List configuredNodes = new ArrayList<>(); for (int i = 0; i < 5; i++) configuredNodes.add(new ConfiguredNode(i, false)); - FleetControllerOptions options = new FleetControllerOptions("mycluster", configuredNodes); + FleetControllerOptions options = defaultOptions("mycluster", configuredNodes); options.maxInitProgressTime = 30000; options.stableStateTimePeriod = 60000; setUpFleetController(true, options); @@ -412,7 +412,7 @@ public class RpcServerTest extends FleetControllerTest { Set configuredNodes = new TreeSet<>(); for (int i = 0; i < 5; i++) configuredNodes.add(new ConfiguredNode(i, false)); - FleetControllerOptions options = new FleetControllerOptions("mycluster", configuredNodes); + FleetControllerOptions options = defaultOptions("mycluster", configuredNodes); options.slobrokConnectionSpecs = this.options.slobrokConnectionSpecs; this.options.maxInitProgressTime = 30000; this.options.stableStateTimePeriod = 60000; @@ -427,7 +427,7 @@ public class RpcServerTest extends FleetControllerTest { configuredNodes.add(new ConfiguredNode(i, true)); configuredNodes.add(new ConfiguredNode(5, false)); configuredNodes.add(new ConfiguredNode(6, false)); - FleetControllerOptions options = new FleetControllerOptions("mycluster", configuredNodes); + FleetControllerOptions options = defaultOptions("mycluster", configuredNodes); options.slobrokConnectionSpecs = this.options.slobrokConnectionSpecs; this.options.maxInitProgressTime = 30000; this.options.stableStateTimePeriod = 60000; @@ -441,7 +441,7 @@ public class RpcServerTest extends FleetControllerTest { configuredNodes.add(new ConfiguredNode(i, true)); configuredNodes.add(new ConfiguredNode(5, false)); configuredNodes.add(new ConfiguredNode(6, false)); - FleetControllerOptions options = new FleetControllerOptions("mycluster", configuredNodes); + FleetControllerOptions options = defaultOptions("mycluster", configuredNodes); options.slobrokConnectionSpecs = this.options.slobrokConnectionSpecs; this.options.maxInitProgressTime = 30000; this.options.stableStateTimePeriod = 60000; @@ -489,7 +489,7 @@ public class RpcServerTest extends FleetControllerTest { @Test public void testSetNodeState() throws Exception { startingTest("RpcServerTest::testSetNodeState"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); Set nodeIndexes = new TreeSet<>(Arrays.asList(new Integer[]{4, 6, 9, 10, 14, 16, 21, 22, 23, 25})); options.setStorageDistribution(new Distribution(getDistConfig(nodeIndexes))); setUpFleetController(true, options); @@ -535,7 +535,7 @@ public class RpcServerTest extends FleetControllerTest { @Test public void testSetNodeStateOutOfRange() throws Exception { startingTest("RpcServerTest::testSetNodeStateOutOfRange"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.setStorageDistribution(new Distribution(Distribution.getDefaultDistributionConfig(2, 10))); setUpFleetController(true, options); setUpVdsNodes(true, new DummyVdsNodeOptions()); @@ -572,7 +572,7 @@ public class RpcServerTest extends FleetControllerTest { @Test public void testGetMaster() throws Exception { startingTest("RpcServerTest::testGetMaster"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.setStorageDistribution(new Distribution(Distribution.getDefaultDistributionConfig(2, 10))); setUpFleetController(true, options); setUpVdsNodes(true, new DummyVdsNodeOptions()); @@ -594,7 +594,7 @@ public class RpcServerTest extends FleetControllerTest { @Test public void testGetNodeList() throws Exception { startingTest("RpcServerTest::testGetNodeList"); - setUpFleetController(true, new FleetControllerOptions("mycluster")); + setUpFleetController(true, defaultOptions("mycluster")); setUpVdsNodes(true, new DummyVdsNodeOptions()); waitForStableSystem(); diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcVersionAutoDowngradeTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcVersionAutoDowngradeTest.java index e9eaf56085b..b76f1fc20bf 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcVersionAutoDowngradeTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcVersionAutoDowngradeTest.java @@ -17,7 +17,7 @@ public class RpcVersionAutoDowngradeTest extends FleetControllerTest { for (int i = 0 ; i < 10; i++) { configuredNodes.add(new ConfiguredNode(i, false)); } - FleetControllerOptions options = new FleetControllerOptions("mycluster", configuredNodes); + FleetControllerOptions options = defaultOptions("mycluster", configuredNodes); setUpFleetController(false, options); DummyVdsNodeOptions nodeOptions = new DummyVdsNodeOptions(); nodeOptions.stateCommunicationVersion = nodeRpcVersion; diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SlobrokTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SlobrokTest.java index 1de5848fc06..209da523705 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SlobrokTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SlobrokTest.java @@ -33,7 +33,7 @@ public class SlobrokTest extends FleetControllerTest { @Test public void testSingleSlobrokRestart() throws Exception { startingTest("SlobrokTest::testSingleSlobrokRestart"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.nodeStateRequestTimeoutMS = 60 * 60 * 1000; options.maxSlobrokDisconnectGracePeriod = 60 * 60 * 1000; setUpFleetController(true, options); @@ -87,7 +87,7 @@ public class SlobrokTest extends FleetControllerTest { @Test public void testNodeTooLongOutOfSlobrok() throws Exception { startingTest("SlobrokTest::testNodeTooLongOutOfSlobrok"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.maxSlobrokDisconnectGracePeriod = 60 * 1000; options.nodeStateRequestTimeoutMS = 10000 * 60 * 1000; setUpFleetController(true, options); diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java index 85106ce7e3c..4c040798eb0 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java @@ -95,7 +95,7 @@ public class StateChangeTest extends FleetControllerTest { @Test public void testNormalStartup() throws Exception { - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.maxInitProgressTime = 50000; initialize(options); @@ -167,7 +167,7 @@ public class StateChangeTest extends FleetControllerTest { @Test public void testNodeGoingDownAndUp() throws Exception { - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.nodeStateRequestTimeoutMS = 60 * 60 * 1000; options.minTimeBetweenNewSystemStates = 0; options.maxInitProgressTime = 50000; @@ -257,7 +257,7 @@ public class StateChangeTest extends FleetControllerTest { @Test public void testNodeGoingDownAndUpNotifying() throws Exception { // Same test as above, but node manages to notify why it is going down first. - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.nodeStateRequestTimeoutMS = 60 * 60 * 1000; options.maxSlobrokDisconnectGracePeriod = 100000; @@ -328,7 +328,7 @@ public class StateChangeTest extends FleetControllerTest { @Test public void testNodeGoingDownAndUpFast() throws Exception { - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.maxSlobrokDisconnectGracePeriod = 60 * 1000; initialize(options); @@ -369,7 +369,7 @@ public class StateChangeTest extends FleetControllerTest { @Test public void testMaintenanceWhileNormalStorageNodeRestart() throws Exception { - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.maxSlobrokDisconnectGracePeriod = 60 * 1000; initialize(options); @@ -429,7 +429,7 @@ public class StateChangeTest extends FleetControllerTest { nodes.add(new ConfiguredNode(i, retired)); } - FleetControllerOptions options = new FleetControllerOptions("mycluster", nodes); + FleetControllerOptions options = defaultOptions("mycluster", nodes); options.maxSlobrokDisconnectGracePeriod = 60 * 1000; initialize(options); @@ -488,7 +488,7 @@ public class StateChangeTest extends FleetControllerTest { nodes.add(new ConfiguredNode(i, retired)); } - FleetControllerOptions options = new FleetControllerOptions("mycluster", nodes); + FleetControllerOptions options = defaultOptions("mycluster", nodes); options.maxSlobrokDisconnectGracePeriod = 60 * 1000; initialize(options); @@ -511,7 +511,7 @@ public class StateChangeTest extends FleetControllerTest { @Test public void testDownNodeInitializing() throws Exception { // Actually report initializing state if node has been down steadily for a while - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.maxTransitionTime.put(NodeType.STORAGE, 5000); options.maxInitProgressTime = 5000; options.stableStateTimePeriod = 20000; @@ -574,7 +574,7 @@ public class StateChangeTest extends FleetControllerTest { @Test public void testNodeInitializationStalled() throws Exception { // Node should eventually be marked down, and not become initializing next time, but stay down until up - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.maxTransitionTime.put(NodeType.STORAGE, 5000); options.maxInitProgressTime = 5000; options.stableStateTimePeriod = 1000000; @@ -660,7 +660,7 @@ public class StateChangeTest extends FleetControllerTest { @Test public void testBackwardsInitializationProgress() throws Exception { // Same as stalled. Mark down, keep down until up - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.maxTransitionTime.put(NodeType.STORAGE, 5000); options.maxInitProgressTime = 5000; options.stableStateTimePeriod = 1000000; @@ -703,7 +703,7 @@ public class StateChangeTest extends FleetControllerTest { @Test public void testNodeGoingDownWhileInitializing() throws Exception { // Same as stalled. Mark down, keep down until up - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.maxTransitionTime.put(NodeType.STORAGE, 5000); options.maxInitProgressTime = 5000; options.stableStateTimePeriod = 1000000; @@ -762,7 +762,7 @@ public class StateChangeTest extends FleetControllerTest { public void testContinuousCrashRightAfterInit() throws Exception { startingTest("StateChangeTest::testContinuousCrashRightAfterInit"); // If node does this too many times, take it out of service - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.maxTransitionTime.put(NodeType.STORAGE, 5000); options.maxInitProgressTime = 5000; options.maxPrematureCrashes = 2; @@ -816,7 +816,7 @@ public class StateChangeTest extends FleetControllerTest { public void testClusterStateMinNodes() throws Exception { startingTest("StateChangeTest::testClusterStateMinNodes"); // If node does this too many times, take it out of service - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.maxTransitionTime.put(NodeType.STORAGE, 0); options.maxInitProgressTime = 0; options.minDistributorNodesUp = 6; @@ -871,7 +871,7 @@ public class StateChangeTest extends FleetControllerTest { public void testClusterStateMinFactor() throws Exception { startingTest("StateChangeTest::testClusterStateMinFactor"); // If node does this too many times, take it out of service - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.maxTransitionTime.put(NodeType.STORAGE, 0); options.maxInitProgressTime = 0; options.minDistributorNodesUp = 0; @@ -944,7 +944,7 @@ public class StateChangeTest extends FleetControllerTest { @Test public void testNoSystemStateBeforeInitialTimePeriod() throws Exception { startingTest("StateChangeTest::testNoSystemStateBeforeInitialTimePeriod()"); - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.minTimeBeforeFirstSystemStateBroadcast = 3 * 60 * 1000; setUpSystem(true, options); setUpVdsNodes(true, new DummyVdsNodeOptions(), true); @@ -985,7 +985,7 @@ public class StateChangeTest extends FleetControllerTest { @Test public void testSystemStateSentWhenNodesReplied() throws Exception { startingTest("StateChangeTest::testSystemStateSentWhenNodesReplied()"); - final FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + final FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.minTimeBeforeFirstSystemStateBroadcast = 300 * 60 * 1000; setUpSystem(true, options); @@ -1019,7 +1019,7 @@ public class StateChangeTest extends FleetControllerTest { @Test public void testDontTagFailingSetSystemStateOk() throws Exception { startingTest("StateChangeTest::testDontTagFailingSetSystemStateOk()"); - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); setUpFleetController(true, options); setUpVdsNodes(true, new DummyVdsNodeOptions()); waitForStableSystem(); @@ -1050,7 +1050,7 @@ public class StateChangeTest extends FleetControllerTest { @Test public void testAlteringDistributionSplitCount() throws Exception { startingTest("StateChangeTest::testAlteringDistributionSplitCount"); - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.distributionBits = 17; initialize(options); @@ -1097,7 +1097,7 @@ public class StateChangeTest extends FleetControllerTest { @Test public void testSetAllTimestampsAfterDowntime() throws Exception { startingTest("StateChangeTest::testSetAllTimestampsAfterDowntime"); - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); setUpFleetController(true, options); setUpVdsNodes(true, new DummyVdsNodeOptions()); waitForStableSystem(); @@ -1146,7 +1146,7 @@ public class StateChangeTest extends FleetControllerTest { @Test public void consolidated_cluster_state_reflects_node_changes_when_cluster_is_down() throws Exception { - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.maxTransitionTime.put(NodeType.STORAGE, 0); options.minStorageNodesUp = 10; options.minDistributorNodesUp = 10; @@ -1180,7 +1180,7 @@ public class StateChangeTest extends FleetControllerTest { // of previous timer invocations (with subsequent state generation) would not be visible. @Test public void timer_events_during_cluster_down_observe_most_recent_node_changes() throws Exception { - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.maxTransitionTime.put(NodeType.STORAGE, 1000); options.minStorageNodesUp = 10; options.minDistributorNodesUp = 10; @@ -1212,7 +1212,7 @@ public class StateChangeTest extends FleetControllerTest { @Test public void do_not_emit_multiple_events_when_node_state_does_not_match_versioned_state() throws Exception { - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); initialize(options); ctrl.tick(); @@ -1384,11 +1384,11 @@ public class StateChangeTest extends FleetControllerTest { } private static FleetControllerOptions defaultOptions() { - return new FleetControllerOptions("mycluster", createNodes(10)); + return defaultOptions("mycluster", createNodes(10)); } private static FleetControllerOptions optionsWithZeroTransitionTime() { - FleetControllerOptions options = new FleetControllerOptions("mycluster", createNodes(10)); + FleetControllerOptions options = defaultOptions("mycluster", createNodes(10)); options.maxTransitionTime.put(NodeType.STORAGE, 0); return options; } diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateGatherTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateGatherTest.java index f208003e46e..007bda04f4e 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateGatherTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateGatherTest.java @@ -27,7 +27,7 @@ public class StateGatherTest extends FleetControllerTest { public void testAlwaysHavePendingGetNodeStateRequestTowardsNodes() throws Exception { Logger.getLogger(NodeStateGatherer.class.getName()).setLevel(LogLevel.SPAM); startingTest("StateGatherTest::testOverlappingGetNodeStateRequests"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.nodeStateRequestTimeoutMS = 10 * 60 * 1000; // Force actual message timeout to be lower than request timeout. options.nodeStateRequestTimeoutEarliestPercentage = 80; diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StatusPagesTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StatusPagesTest.java index 45f11a2a0f3..fc18a1b0b8b 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StatusPagesTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StatusPagesTest.java @@ -78,7 +78,7 @@ public class StatusPagesTest extends FleetControllerTest { @Test public void testStatusThroughContainer() throws Exception { startingTest("StatusPagesTest::testStatusThroughContainer()"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.setStorageDistribution(new Distribution(Distribution.getDefaultDistributionConfig(3, 10))); final StatusHandler.ContainerStatusPageServer statusServer = new StatusHandler.ContainerStatusPageServer(); setUpFleetController(true, options, true, statusServer); @@ -176,7 +176,7 @@ public class StatusPagesTest extends FleetControllerTest { // Set this to true temporary if you want to check status page from browser. Should be false in checked in code always. boolean haltTestToViewStatusPage = false; startingTest("StatusPagesTest::testSimpleConnectionWithSomeContent()"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.setStorageDistribution(new Distribution(Distribution.getDefaultDistributionConfig(3, 10))); //options.minRatioOfStorageNodesUp = 0.99; if (haltTestToViewStatusPage) { @@ -211,7 +211,7 @@ public class StatusPagesTest extends FleetControllerTest { @Test public void testNodePage() throws Exception { startingTest("StatusPagesTest::testNodePage()"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.setStorageDistribution(new Distribution(Distribution.getDefaultDistributionConfig(3, 10))); setUpFleetController(true, options); setUpVdsNodes(true, new DummyVdsNodeOptions()); @@ -231,7 +231,7 @@ public class StatusPagesTest extends FleetControllerTest { @Test public void testErrorResponseCode() throws Exception { startingTest("StatusPagesTest::testNodePage()"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); options.setStorageDistribution(new Distribution(Distribution.getDefaultDistributionConfig(3, 10))); setUpFleetController(true, options); setUpVdsNodes(true, new DummyVdsNodeOptions()); @@ -348,7 +348,7 @@ public class StatusPagesTest extends FleetControllerTest { @Test public void testStateServing() throws Exception { startingTest("StatusPagesTest::testStateServing()"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); setUpFleetController(true, options); fleetController.updateOptions(options, 5); waitForCompleteCycle(); @@ -376,7 +376,7 @@ public class StatusPagesTest extends FleetControllerTest { @Test public void testClusterStateServing() throws Exception { startingTest("StatusPagesTest::testClusterStateServing()"); - FleetControllerOptions options = new FleetControllerOptions("mycluster"); + FleetControllerOptions options = defaultOptions("mycluster"); setUpFleetController(true, options); fleetController.updateOptions(options, 5); waitForCompleteCycle(); diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcasterTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcasterTest.java index f4afb08de7c..98ad19b954a 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcasterTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcasterTest.java @@ -298,6 +298,4 @@ public class SystemStateBroadcasterTest { }); } - // TODO FleetControllerOptions change default 2phase option to false and override tests...? Sounds safer! - } diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/WantedStateTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/WantedStateTest.java index 6e5b40aa7d9..bc7ee6adee1 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/WantedStateTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/WantedStateTest.java @@ -10,7 +10,7 @@ public class WantedStateTest extends FleetControllerTest { @Test public void testSettingStorageNodeMaintenanceAndBack() throws Exception { startingTest("WantedStateTest::testSettingStorageNodeMaintenanceAndBack()"); - setUpFleetController(true, new FleetControllerOptions("mycluster")); + setUpFleetController(true, defaultOptions("mycluster")); setUpVdsNodes(true, new DummyVdsNodeOptions()); waitForStableSystem(); @@ -24,7 +24,7 @@ public class WantedStateTest extends FleetControllerTest { @Test public void testOverridingWantedStateOtherReason() throws Exception { startingTest("WantedStateTest::testOverridingWantedStateOtherReason()"); - setUpFleetController(true, new FleetControllerOptions("mycluster")); + setUpFleetController(true, defaultOptions("mycluster")); setUpVdsNodes(true, new DummyVdsNodeOptions()); waitForStableSystem(); -- cgit v1.2.3