diff options
author | Harald Musum <musum@yahooinc.com> | 2022-09-01 14:30:35 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2022-09-01 14:30:35 +0200 |
commit | c5d3a371b17b706eb9e66e6085ee804c6aef8a59 (patch) | |
tree | 066a503bf22d6784cb32de29afc62c61d6bfe702 /clustercontroller-core/src/test/java | |
parent | b7df8e7c1f7832cd190526d3915434002d1de6e5 (diff) |
Exgtract CleanupZookeeperLogsOnSuccess into its own class
Diffstat (limited to 'clustercontroller-core/src/test/java')
14 files changed, 52 insertions, 30 deletions
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/CleanupZookeeperLogsOnSuccess.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/CleanupZookeeperLogsOnSuccess.java new file mode 100644 index 00000000000..9fe56cceec5 --- /dev/null +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/CleanupZookeeperLogsOnSuccess.java @@ -0,0 +1,29 @@ +package com.yahoo.vespa.clustercontroller.core; + +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.TestWatcher; + +public class CleanupZookeeperLogsOnSuccess implements TestWatcher { + + public CleanupZookeeperLogsOnSuccess() {} + + @Override + public void testFailed(ExtensionContext context, Throwable cause) { + System.err.println("TEST FAILED - NOT cleaning up zookeeper directory"); + shutdownZooKeeper(context, false); + } + + @Override + public void testSuccessful(ExtensionContext context) { + System.err.println("TEST SUCCEEDED - cleaning up zookeeper directory"); + shutdownZooKeeper(context, true); + } + + private void shutdownZooKeeper(ExtensionContext ctx, boolean cleanupZooKeeperDir) { + FleetControllerTest test = (FleetControllerTest) ctx.getTestInstance().orElseThrow(); + if (test.zooKeeperServer != null) { + test.zooKeeperServer.shutdown(cleanupZooKeeperDir); + test.zooKeeperServer = null; + } + } +} diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFeedBlockTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFeedBlockTest.java index 39878928944..409e8932867 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFeedBlockTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFeedBlockTest.java @@ -13,6 +13,7 @@ import com.yahoo.vespa.clustercontroller.core.status.StatusHandler; import com.yahoo.vespa.clustercontroller.utils.util.NoMetricReporter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.util.ArrayList; import java.util.HashSet; @@ -28,6 +29,7 @@ import static com.yahoo.vespa.clustercontroller.core.FeedBlockUtil.createResourc import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +@ExtendWith(CleanupZookeeperLogsOnSuccess.class) public class ClusterFeedBlockTest extends FleetControllerTest { private static final int NODE_COUNT = 3; 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 26bb21da3d4..3e8f60e3a6a 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 @@ -13,6 +13,7 @@ import com.yahoo.vdslib.state.NodeState; import com.yahoo.vdslib.state.NodeType; import com.yahoo.vdslib.state.State; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.util.Map; import java.util.TreeMap; @@ -21,6 +22,7 @@ import java.util.logging.Logger; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +@ExtendWith(CleanupZookeeperLogsOnSuccess.class) public class DatabaseTest extends FleetControllerTest { private static final Logger log = Logger.getLogger(DatabaseTest.class.getName()); 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 bf8bb722e3d..0f2e2e23492 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 @@ -7,12 +7,14 @@ import com.yahoo.vdslib.state.NodeState; import com.yahoo.vdslib.state.NodeType; import com.yahoo.vdslib.state.State; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.util.ArrayList; import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; +@ExtendWith(CleanupZookeeperLogsOnSuccess.class) public class DistributionBitCountTest extends FleetControllerTest { private FleetControllerOptions setUpSystem(String testName) throws Exception { 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 58a076a6176..bf06474a3af 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 @@ -26,9 +26,6 @@ import com.yahoo.vespa.clustercontroller.core.testutils.WaitTask; import com.yahoo.vespa.clustercontroller.core.testutils.Waiter; import com.yahoo.vespa.clustercontroller.utils.util.NoMetricReporter; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.api.extension.ExtensionContext; -import org.junit.jupiter.api.extension.TestWatcher; import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; @@ -49,7 +46,6 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author HÃ¥kon Humberset */ -@ExtendWith(FleetControllerTest.CleanupZookeeperLogsOnSuccess.class) public abstract class FleetControllerTest implements Waiter { private static final Logger log = Logger.getLogger(FleetControllerTest.class.getName()); @@ -81,31 +77,6 @@ public abstract class FleetControllerTest implements Waiter { LogSetup.initVespaLogging("fleetcontroller"); } - public static class CleanupZookeeperLogsOnSuccess implements TestWatcher { - - public CleanupZookeeperLogsOnSuccess() {} - - @Override - public void testFailed(ExtensionContext context, Throwable cause) { - System.err.println("TEST FAILED - NOT cleaning up zookeeper directory"); - shutdownZooKeeper(context, false); - } - - @Override - public void testSuccessful(ExtensionContext context) { - System.err.println("TEST SUCCEEDED - cleaning up zookeeper directory"); - shutdownZooKeeper(context, true); - } - - private void shutdownZooKeeper(ExtensionContext ctx, boolean cleanupZooKeeperDir) { - FleetControllerTest test = (FleetControllerTest) ctx.getTestInstance().orElseThrow(); - if (test.zooKeeperServer != null) { - test.zooKeeperServer.shutdown(cleanupZooKeeperDir); - test.zooKeeperServer = null; - } - } - } - protected void startingTest(String name) { System.err.println("STARTING TEST: " + name); testName = name; 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 2d2790119e9..9a5be27da94 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 @@ -3,11 +3,13 @@ package com.yahoo.vespa.clustercontroller.core; import com.yahoo.vdslib.state.NodeType; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.util.HashSet; import static org.junit.jupiter.api.Assertions.assertFalse; +@ExtendWith(CleanupZookeeperLogsOnSuccess.class) public class GroupAutoTakedownLiveConfigTest extends FleetControllerTest { private static FleetControllerOptions.Builder createOptions(DistributionBuilder.GroupBuilder groupBuilder, double minNodeRatio) { 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 c5d7c520751..e13fb1512d7 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 @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -@ExtendWith(FleetControllerTest.CleanupZookeeperLogsOnSuccess.class) +@ExtendWith(CleanupZookeeperLogsOnSuccess.class) @Timeout(120) public class MasterElectionTest extends FleetControllerTest { 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 8a16efe0bfa..9acaf46b144 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 @@ -5,11 +5,13 @@ import com.yahoo.vdslib.distribution.ConfiguredNode; import com.yahoo.vdslib.state.NodeType; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.extension.ExtendWith; import java.util.Set; import java.util.TreeSet; import static org.junit.jupiter.api.Assertions.assertTrue; +@ExtendWith(CleanupZookeeperLogsOnSuccess.class) @Timeout(30) public class NodeSlobrokConfigurationMembershipTest extends FleetControllerTest { 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 d36486d2eb6..63505bbd251 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 @@ -22,6 +22,7 @@ import com.yahoo.vespa.clustercontroller.core.rpc.RpcServer; import com.yahoo.vespa.clustercontroller.core.testutils.LogFormatter; import com.yahoo.vespa.clustercontroller.core.testutils.WaitCondition; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -38,6 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author humbe */ +@ExtendWith(CleanupZookeeperLogsOnSuccess.class) public class RpcServerTest extends FleetControllerTest { public static Logger log = Logger.getLogger(RpcServerTest.class.getName()); 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 2c68c498e68..3740c6de491 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 @@ -5,10 +5,12 @@ import com.yahoo.vdslib.distribution.ConfiguredNode; import com.yahoo.vdslib.state.NodeState; import com.yahoo.vdslib.state.State; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.util.ArrayList; import java.util.List; +@ExtendWith(CleanupZookeeperLogsOnSuccess.class) public class RpcVersionAutoDowngradeTest extends FleetControllerTest { private void setUpFakeCluster(int nodeRpcVersion) throws Exception { 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 4cf69b778a2..03ef88c09ee 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 @@ -3,12 +3,14 @@ package com.yahoo.vespa.clustercontroller.core; import com.yahoo.jrt.slobrok.server.Slobrok; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.util.logging.Level; import java.util.logging.Logger; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +@ExtendWith(CleanupZookeeperLogsOnSuccess.class) public class SlobrokTest extends FleetControllerTest { private static final Logger log = Logger.getLogger(SlobrokTest.class.getName()); 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 56fcd4666e8..7db8f47ce5b 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 @@ -16,6 +16,7 @@ import com.yahoo.vespa.clustercontroller.core.testutils.StateWaiter; import com.yahoo.vespa.clustercontroller.utils.util.NoMetricReporter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.time.Duration; import java.util.ArrayList; @@ -28,6 +29,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.*; +@ExtendWith(CleanupZookeeperLogsOnSuccess.class) public class StateChangeTest extends FleetControllerTest { public static Logger log = Logger.getLogger(StateChangeTest.class.getName()); 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 6ecfc9ca550..58df1c1f5eb 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 @@ -3,6 +3,7 @@ package com.yahoo.vespa.clustercontroller.core; import com.yahoo.vdslib.state.NodeType; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.time.Instant; import java.util.concurrent.TimeoutException; import java.util.logging.Level; @@ -10,6 +11,7 @@ import java.util.logging.Logger; import static org.junit.jupiter.api.Assertions.assertEquals; +@ExtendWith(CleanupZookeeperLogsOnSuccess.class) public class StateGatherTest extends FleetControllerTest { public static Logger log = Logger.getLogger(StateGatherTest.class.getName()); 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 e89f5fc7e58..86bf7a66458 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 @@ -3,9 +3,11 @@ package com.yahoo.vespa.clustercontroller.core; import com.yahoo.vdslib.state.State; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import static org.junit.jupiter.api.Assertions.assertEquals; +@ExtendWith(CleanupZookeeperLogsOnSuccess.class) public class WantedStateTest extends FleetControllerTest { @Test |