From d15ec78127c5aa3c79156dd23eeeea769b52fc97 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 11 May 2023 09:44:47 +0200 Subject: Remove testname and logging related to starting and stopping Not used, reintroduce using junit TestInfo class if needed --- .../yahoo/vespa/clustercontroller/core/DatabaseTest.java | 2 -- .../clustercontroller/core/DistributionBitCountTest.java | 13 ++++++------- .../vespa/clustercontroller/core/FleetControllerTest.java | 11 ----------- .../vespa/clustercontroller/core/MasterElectionTest.java | 13 ------------- .../yahoo/vespa/clustercontroller/core/NoZooKeeperTest.java | 1 - .../yahoo/vespa/clustercontroller/core/RpcServerTest.java | 11 ----------- .../com/yahoo/vespa/clustercontroller/core/SlobrokTest.java | 2 -- .../yahoo/vespa/clustercontroller/core/StateChangeTest.java | 8 -------- .../yahoo/vespa/clustercontroller/core/StateGatherTest.java | 3 +-- .../yahoo/vespa/clustercontroller/core/WantedStateTest.java | 2 -- 10 files changed, 7 insertions(+), 59 deletions(-) (limited to 'clustercontroller-core/src') 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 a66294851b8..1e7033f5e44 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 @@ -35,7 +35,6 @@ public class DatabaseTest extends FleetControllerTest { @Test void testWantedStatesInZooKeeper() throws Exception { - startingTest("DatabaseTest::testWantedStatesInZooKeeper"); FleetControllerOptions.Builder builder = defaultOptions("mycluster"); builder.setZooKeeperServerAddress("127.0.0.1"); setUpFleetController(true, builder); @@ -89,7 +88,6 @@ public class DatabaseTest extends FleetControllerTest { @Test void testWantedStateOfUnknownNode() throws Exception { - startingTest("DatabaseTest::testWantedStatesOfUnknownNode"); FleetControllerOptions.Builder builder = defaultOptions("mycluster") .setMinRatioOfDistributorNodesUp(0) .setMinRatioOfStorageNodesUp(0) 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 cec23930ea8..77bf7895e8c 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 @@ -17,7 +17,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @ExtendWith(CleanupZookeeperLogsOnSuccess.class) public class DistributionBitCountTest extends FleetControllerTest { - private FleetControllerOptions setUpSystem(String testName) throws Exception { + private FleetControllerOptions setUpSystem() throws Exception { List configuredNodes = new ArrayList<>(); for (int i = 0 ; i < 10; i++) { configuredNodes.add(new ConfiguredNode(i, false)); @@ -25,7 +25,6 @@ public class DistributionBitCountTest extends FleetControllerTest { var builder = defaultOptions("mycluster", configuredNodes); builder.setDistributionBits(17); setUpFleetController(false, builder); - startingTest(testName); List nodes = setUpVdsNodes(false, true, configuredNodes); for (DummyVdsNode node : nodes) { node.setNodeState(new NodeState(node.getType(), State.UP).setMinUsedBits(20)); @@ -41,7 +40,7 @@ public class DistributionBitCountTest extends FleetControllerTest { */ @Test void testDistributionBitCountConfigIncrease() throws Exception { - var options = setUpSystem("DistributionBitCountTest::testDistributionBitCountConfigIncrease"); + var options = setUpSystem(); var builder = FleetControllerOptions.Builder.copy(options); builder.setDistributionBits(20); fleetController().updateOptions(builder.build()); @@ -58,7 +57,7 @@ public class DistributionBitCountTest extends FleetControllerTest { */ @Test void testDistributionBitCountConfigDecrease() throws Exception { - FleetControllerOptions options = setUpSystem("DistributionBitCountTest::testDistributionBitCountConfigDecrease"); + FleetControllerOptions options = setUpSystem(); var builder = FleetControllerOptions.Builder.copy(options); builder.setDistributionBits(12); fleetController().updateOptions(builder.build()); @@ -68,13 +67,13 @@ public class DistributionBitCountTest extends FleetControllerTest { /** * Test that when storage node reports higher bit count, but another storage * node has equally low bitcount, the fleetcontroller does nothing. - * + *

fleetControllers = new ArrayList<>(); protected List nodes = new ArrayList<>(); - private String testName; private final Waiter waiter = new Waiter.Impl(new DataRetriever() { @Override @@ -74,11 +73,6 @@ public abstract class FleetControllerTest implements Waiter { LogSetup.initVespaLogging("fleetcontroller"); } - protected void startingTest(String name) { - System.err.println("STARTING TEST: " + name); - testName = name; - } - static protected FleetControllerOptions.Builder defaultOptions(String clusterName) { return defaultOptions(clusterName, DEFAULT_NODE_COUNT); } @@ -248,11 +242,6 @@ public abstract class FleetControllerTest implements Waiter { @AfterEach public void tearDown() { - if (testName != null) { - //log.log(Level.INFO, "STOPPING TEST " + testName); - System.err.println("STOPPING TEST " + testName); - testName = null; - } fleetControllers.forEach(f -> { try { f.shutdown(); 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 89210b48f33..2d7d47d515b 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 @@ -100,8 +100,6 @@ public class MasterElectionTest extends FleetControllerTest { @Test void testMasterElection() throws Exception { - startingTest("MasterElectionTest::testMasterElection"); - log.log(Level.INFO, "STARTING TEST: MasterElectionTest::testMasterElection()"); FleetControllerOptions.Builder builder = defaultOptions("mycluster"); builder.setMasterZooKeeperCooldownPeriod(100); boolean usingFakeTimer = false; @@ -129,8 +127,6 @@ public class MasterElectionTest extends FleetControllerTest { @Test void testMasterElectionWith5FleetControllers() throws Exception { - startingTest("MasterElectionTest::testMasterElectionWith5FleetControllers"); - log.log(Level.INFO, "STARTING TEST: MasterElectionTest::testMasterElectionWith5FleetControllers()"); FleetControllerOptions.Builder builder = defaultOptions("mycluster"); boolean usingFakeTimer = false; setUpFleetControllers(5, usingFakeTimer, builder); @@ -194,7 +190,6 @@ public class MasterElectionTest extends FleetControllerTest { @Test void testClusterStateVersionIncreasesAcrossMasterElections() throws Exception { - startingTest("MasterElectionTest::testClusterStateVersionIncreasesAcrossMasterElections"); FleetControllerOptions.Builder options = defaultOptions("mycluster"); options.setMasterZooKeeperCooldownPeriod(1); setUpFleetControllers(3, false, options); @@ -214,7 +209,6 @@ public class MasterElectionTest extends FleetControllerTest { @Test void testVotingCorrectnessInFaceOfZKDisconnect() throws Exception { - startingTest("MasterElectionTest::testVotingCorrectnessInFaceOfZKDisconnect"); FleetControllerOptions.Builder options = defaultOptions("mycluster"); // "Magic" port value is in range allocated to module for testing. zooKeeperServer = ZooKeeperTestServer.createWithFixedPort(18342); @@ -235,7 +229,6 @@ public class MasterElectionTest extends FleetControllerTest { @Test void testZooKeeperUnavailable() throws Exception { - startingTest("MasterElectionTest::testZooKeeperUnavailable"); FleetControllerOptions.Builder builder = defaultOptions("mycluster") .setMasterZooKeeperCooldownPeriod(100) .setZooKeeperServerAddress("localhost"); @@ -268,7 +261,6 @@ public class MasterElectionTest extends FleetControllerTest { @Test @Disabled("Unstable, disable test, as functionality is not deemed critical") void testMasterZooKeeperCooldown() throws Exception { - startingTest("MasterElectionTest::testMasterZooKeeperCooldown"); FleetControllerOptions.Builder options = defaultOptions("mycluster"); options.setMasterZooKeeperCooldownPeriod(3600 * 1000); // An hour setUpFleetControllers(3, true, options); @@ -316,7 +308,6 @@ public class MasterElectionTest extends FleetControllerTest { @Test void testGetMaster() throws Exception { - startingTest("MasterElectionTest::testGetMaster"); FleetControllerOptions.Builder options = defaultOptions("mycluster"); options.setMasterZooKeeperCooldownPeriod(3600 * 1000); // An hour setUpFleetControllers(3, true, options); @@ -397,7 +388,6 @@ public class MasterElectionTest extends FleetControllerTest { @Test void testReconfigure() throws Exception { - startingTest("MasterElectionTest::testReconfigure"); FleetControllerOptions.Builder options = defaultOptions("mycluster"); options.setMasterZooKeeperCooldownPeriod(1); setUpFleetControllers(3, false, options); @@ -422,7 +412,6 @@ public class MasterElectionTest extends FleetControllerTest { */ @Test 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.Builder builder = defaultOptions("mycluster") .setMasterZooKeeperCooldownPeriod(1) .setMinRatioOfDistributorNodesUp(0) @@ -467,7 +456,6 @@ public class MasterElectionTest extends FleetControllerTest { @Test 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.Builder builder = defaultOptions("mycluster") .setClusterHasGlobalDocumentTypes(true) .setMasterZooKeeperCooldownPeriod(1) @@ -510,7 +498,6 @@ public class MasterElectionTest extends FleetControllerTest { @Test 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.Builder builder = defaultOptions("mycluster") .setClusterHasGlobalDocumentTypes(false) .setMasterZooKeeperCooldownPeriod(1) 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 483c92d4861..7030cf4cc16 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,6 @@ public class NoZooKeeperTest extends FleetControllerTest { @Test void testWantedStatesInZooKeeper() throws Exception { - startingTest("NoZooKeeperTest::testWantedStatesInZooKeeper"); // Null is the default for zooKeeperServerAddress FleetControllerOptions.Builder builder = defaultOptions("mycluster"); setUpFleetController(true, builder); 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 995ece46779..b78c4fad1f6 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 @@ -62,7 +62,6 @@ public class RpcServerTest extends FleetControllerTest { @Test void testGetSystemState() throws Exception { LogFormatter.initializeLogging(); - startingTest("RpcServerTest::testGetSystemState"); FleetControllerOptions.Builder options = defaultOptions("mycluster"); setUpFleetController(true, options); setUpVdsNodes(true); @@ -128,7 +127,6 @@ public class RpcServerTest extends FleetControllerTest { @Test void testGetNodeState() throws Exception { - startingTest("RpcServerTest::testGetNodeState"); Set configuredNodes = new TreeSet<>(); for (int i = 0; i < 10; i++) configuredNodes.add(new ConfiguredNode(i, false)); @@ -221,7 +219,6 @@ public class RpcServerTest extends FleetControllerTest { @Test void testGetNodeStateWithConfiguredRetired() throws Exception { - startingTest("RpcServerTest::testGetNodeStateWithConfiguredRetired"); List configuredNodes = new ArrayList<>(); for (int i = 0; i < 4; i++) configuredNodes.add(new ConfiguredNode(i, false)); @@ -255,8 +252,6 @@ public class RpcServerTest extends FleetControllerTest { @Test void testGetNodeStateWithConfigurationChangeToRetiredWhileNodeDown() throws Exception { - startingTest("RpcServerTest::testGetNodeStateWithConfigurationChangeToRetiredWhileNodeDown"); - { // Configuration: 5 nodes, all normal List configuredNodes = new ArrayList<>(); for (int i = 0; i < 5; i++) @@ -336,8 +331,6 @@ public class RpcServerTest extends FleetControllerTest { @Test void testGetNodeStateWithConfigurationChangeToRetired() throws Exception { - startingTest("RpcServerTest::testGetNodeStateWithConfigurationChangeToRetired"); - { // Configuration: 5 nodes, all normal List configuredNodes = new ArrayList<>(); for (int i = 0; i < 5; i++) @@ -415,7 +408,6 @@ public class RpcServerTest extends FleetControllerTest { @Test void testSetNodeState() throws Exception { - startingTest("RpcServerTest::testSetNodeState"); Set nodeIndexes = new TreeSet<>(List.of(4, 6, 9, 10, 14, 16, 21, 22, 23, 25)); Set configuredNodes = nodeIndexes.stream().map(i -> new ConfiguredNode(i, false)).collect(Collectors.toSet()); FleetControllerOptions.Builder options = defaultOptions("mycluster", configuredNodes); @@ -455,7 +447,6 @@ public class RpcServerTest extends FleetControllerTest { @Test void testSetNodeStateOutOfRange() throws Exception { - startingTest("RpcServerTest::testSetNodeStateOutOfRange"); FleetControllerOptions.Builder options = defaultOptions("mycluster"); options.setStorageDistribution(new Distribution(Distribution.getDefaultDistributionConfig(2, 10))); setUpFleetController(true, options); @@ -482,7 +473,6 @@ public class RpcServerTest extends FleetControllerTest { @Test void testGetMaster() throws Exception { - startingTest("RpcServerTest::testGetMaster"); FleetControllerOptions.Builder options = defaultOptions("mycluster"); options.setStorageDistribution(new Distribution(Distribution.getDefaultDistributionConfig(2, 10))); setUpFleetController(true, options); @@ -503,7 +493,6 @@ public class RpcServerTest extends FleetControllerTest { @Test void testGetNodeList() throws Exception { - startingTest("RpcServerTest::testGetNodeList"); setUpFleetController(true, defaultOptions("mycluster", 5)); final int nodeCount = 5; setUpVdsNodes(true, false, nodeCount); 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 6d2a4fdeb24..667dc09361f 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 @@ -17,7 +17,6 @@ public class SlobrokTest extends FleetControllerTest { @Test void testSingleSlobrokRestart() throws Exception { - startingTest("SlobrokTest::testSingleSlobrokRestart"); FleetControllerOptions.Builder builder = defaultOptions("mycluster") .setNodeStateRequestTimeoutMS(60 * 60 * 1000) .setMaxSlobrokDisconnectGracePeriod(60 * 60 * 1000); @@ -72,7 +71,6 @@ public class SlobrokTest extends FleetControllerTest { @Test void testNodeTooLongOutOfSlobrok() throws Exception { - startingTest("SlobrokTest::testNodeTooLongOutOfSlobrok"); FleetControllerOptions.Builder builder = defaultOptions("mycluster") .setMaxSlobrokDisconnectGracePeriod(60 * 1000) .setNodeStateRequestTimeoutMS(10000 * 60 * 1000); 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 7d2cc9b8df2..c9d135d4e11 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 @@ -752,7 +752,6 @@ public class StateChangeTest extends FleetControllerTest { @Test void testContinuousCrashRightAfterInit() throws Exception { - startingTest("StateChangeTest::testContinuousCrashRightAfterInit"); // If node does this too many times, take it out of service FleetControllerOptions.Builder builder = defaultOptions() .setMaxTransitionTime(NodeType.STORAGE, 5000) @@ -806,7 +805,6 @@ public class StateChangeTest extends FleetControllerTest { @Test void testClusterStateMinNodes() throws Exception { - startingTest("StateChangeTest::testClusterStateMinNodes"); // If node does this too many times, take it out of service FleetControllerOptions.Builder builder = defaultOptions() .setMaxTransitionTime(NodeType.STORAGE, 0) @@ -861,7 +859,6 @@ public class StateChangeTest extends FleetControllerTest { @Test void testClusterStateMinFactor() throws Exception { - startingTest("StateChangeTest::testClusterStateMinFactor"); // If node does this too many times, take it out of service FleetControllerOptions.Builder options = defaultOptions(); options.setMaxTransitionTime(NodeType.STORAGE, 0); @@ -935,7 +932,6 @@ public class StateChangeTest extends FleetControllerTest { @Test void testNoSystemStateBeforeInitialTimePeriod() throws Exception { - startingTest("StateChangeTest::testNoSystemStateBeforeInitialTimePeriod()"); FleetControllerOptions.Builder builder = defaultOptions() .setMinTimeBeforeFirstSystemStateBroadcast(3 * 60 * 1000); setUpSystem(builder); @@ -981,7 +977,6 @@ public class StateChangeTest extends FleetControllerTest { @Test void testSystemStateSentWhenNodesReplied() throws Exception { - startingTest("StateChangeTest::testSystemStateSentWhenNodesReplied()"); FleetControllerOptions.Builder builder = defaultOptions() .setMinTimeBeforeFirstSystemStateBroadcast(300 * 60 * 1000); @@ -1019,7 +1014,6 @@ public class StateChangeTest extends FleetControllerTest { @Test void testDontTagFailingSetSystemStateOk() throws Exception { - startingTest("StateChangeTest::testDontTagFailingSetSystemStateOk()"); FleetControllerOptions.Builder options = defaultOptions(); setUpFleetController(true, options); setUpVdsNodes(true); @@ -1050,7 +1044,6 @@ public class StateChangeTest extends FleetControllerTest { @Test void testAlteringDistributionSplitCount() throws Exception { - startingTest("StateChangeTest::testAlteringDistributionSplitCount"); FleetControllerOptions.Builder options = defaultOptions(); options.setDistributionBits(17); @@ -1097,7 +1090,6 @@ public class StateChangeTest extends FleetControllerTest { @Test void testSetAllTimestampsAfterDowntime() throws Exception { - startingTest("StateChangeTest::testSetAllTimestampsAfterDowntime"); FleetControllerOptions.Builder options = defaultOptions(); setUpFleetController(true, options); setUpVdsNodes(true); 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 796204989b9..7848320f60a 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 @@ -28,8 +28,7 @@ public class StateGatherTest extends FleetControllerTest { @Test void testAlwaysHavePendingGetNodeStateRequestTowardsNodes() throws Exception { - Logger.getLogger(NodeStateGatherer.class.getName()).setLevel(Level.FINEST); - startingTest("StateGatherTest::testOverlappingGetNodeStateRequests"); + //Logger.getLogger(NodeStateGatherer.class.getName()).setLevel(Level.FINEST); FleetControllerOptions.Builder builder = defaultOptions("mycluster") .setNodeStateRequestTimeoutMS(10 * 60 * 1000) // Force actual message timeout to be lower than request timeout. 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 909f5a1f784..4dcd0a6f499 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 @@ -28,7 +28,6 @@ public class WantedStateTest extends FleetControllerTest { @Test void testSettingStorageNodeMaintenanceAndBack() throws Exception { - startingTest("WantedStateTest::testSettingStorageNodeMaintenanceAndBack()"); setUpFleetController(true, defaultOptions("mycluster")); setUpVdsNodes(true); waitForStableSystem(); @@ -42,7 +41,6 @@ public class WantedStateTest extends FleetControllerTest { @Test void testOverridingWantedStateOtherReason() throws Exception { - startingTest("WantedStateTest::testOverridingWantedStateOtherReason()"); setUpFleetController(true, defaultOptions("mycluster")); setUpVdsNodes(true); waitForStableSystem(); -- cgit v1.2.3