From 333563680c5f8501824bd14ec7bc31d324359a02 Mon Sep 17 00:00:00 2001 From: Kabir Khan <kkhan@redhat.com> Date: Fri, 26 Apr 2024 14:34:41 +0100 Subject: [PATCH 1/2] [WFLY-19286] Add ServerSetupTasks to reload server to a desired stability level --- .../AbstractStabilityServerSetupTaskTest.java | 67 ++++++ ...StabilityCommunityServerSetupTestCase.java | 35 +++ .../StabilityDefaultServerSetupTestCase.java | 33 +++ ...bilityExperimentalServerSetupTestCase.java | 34 +++ .../StabilityPreviewServerSetupTestCase.java | 34 +++ ...bilityServerSetupSnapshotRestoreTasks.java | 225 ++++++++++++++++++ 6 files changed, 428 insertions(+) create mode 100644 testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/AbstractStabilityServerSetupTaskTest.java create mode 100644 testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/StabilityCommunityServerSetupTestCase.java create mode 100644 testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/StabilityDefaultServerSetupTestCase.java create mode 100644 testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/StabilityExperimentalServerSetupTestCase.java create mode 100644 testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/StabilityPreviewServerSetupTestCase.java create mode 100644 testsuite/shared/src/main/java/org/wildfly/test/stabilitylevel/StabilityServerSetupSnapshotRestoreTasks.java diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/AbstractStabilityServerSetupTaskTest.java b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/AbstractStabilityServerSetupTaskTest.java new file mode 100644 index 000000000000..57f85f044993 --- /dev/null +++ b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/AbstractStabilityServerSetupTaskTest.java @@ -0,0 +1,67 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.jboss.as.test.smoke.stability; + +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.CORE_SERVICE; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.STABILITY; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SYSTEM_PROPERTY; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.VALUE; +import static org.jboss.as.server.controller.descriptions.ServerDescriptionConstants.SERVER_ENVIRONMENT; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.as.arquillian.container.ManagementClient; +import org.jboss.as.controller.PathAddress; +import org.jboss.as.controller.operations.common.Util; +import org.jboss.as.test.integration.management.ManagementOperations; +import org.jboss.as.version.Stability; +import org.jboss.dmr.ModelNode; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.EmptyAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.Assert; +import org.junit.Test; + +public abstract class AbstractStabilityServerSetupTaskTest { + private final Stability desiredStability; + + @ArquillianResource + private ManagementClient managementClient; + + public AbstractStabilityServerSetupTaskTest(Stability desiredStability) { + this.desiredStability = desiredStability; + } + + @Deployment + public static JavaArchive createDeployment() { + JavaArchive jar = ShrinkWrap.create(JavaArchive.class, "stability-test.jar"); + jar.add(EmptyAsset.INSTANCE, "dummy.txt"); + return jar; + } + + + @Test + public void testStabilityMatchesSetupTask() throws Exception { + ModelNode op = Util.getReadAttributeOperation(PathAddress.pathAddress(CORE_SERVICE, SERVER_ENVIRONMENT), STABILITY); + ModelNode result = ManagementOperations.executeOperation(managementClient.getControllerClient(), op); + Stability stability = Stability.fromString(result.asString()); + Assert.assertEquals(desiredStability, stability); + } + + @Test + public void testSystemPropertyWasSetByDoSetupCalls() throws Exception { + ModelNode read = Util.getReadAttributeOperation(PathAddress.pathAddress(SYSTEM_PROPERTY, AbstractStabilityServerSetupTaskTest.class.getName()), VALUE); + ModelNode result = ManagementOperations.executeOperation(managementClient.getControllerClient(), read); + Assert.assertEquals(this.getClass().getName(), result.asString()); + } + + + protected static <T extends AbstractStabilityServerSetupTaskTest> void addSystemProperty(ManagementClient client, Class<T> clazz) throws Exception { + ModelNode add = Util.createAddOperation(PathAddress.pathAddress(SYSTEM_PROPERTY, AbstractStabilityServerSetupTaskTest.class.getName())); + add.get(VALUE).set(clazz.getName()); + ManagementOperations.executeOperation(client.getControllerClient(), add); + } +} diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/StabilityCommunityServerSetupTestCase.java b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/StabilityCommunityServerSetupTestCase.java new file mode 100644 index 000000000000..af5f4d096e09 --- /dev/null +++ b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/StabilityCommunityServerSetupTestCase.java @@ -0,0 +1,35 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.jboss.as.test.smoke.stability; + +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.as.arquillian.api.ServerSetup; +import org.jboss.as.arquillian.container.ManagementClient; +import org.jboss.as.version.Stability; +import org.junit.runner.RunWith; +import org.wildfly.test.stabilitylevel.StabilityServerSetupSnapshotRestoreTasks; + +@ServerSetup(StabilityCommunityServerSetupTestCase.CommunityStabilitySetupTask.class) +@RunWith(Arquillian.class) +@RunAsClient +public class StabilityCommunityServerSetupTestCase extends AbstractStabilityServerSetupTaskTest { + public StabilityCommunityServerSetupTestCase() { + super(Stability.COMMUNITY); + } + + + public static class CommunityStabilitySetupTask extends StabilityServerSetupSnapshotRestoreTasks.Community { + @Override + protected void doSetup(ManagementClient managementClient) throws Exception { + // Not really needed since the resulting written xml will be of a higher stability level + // than the server. Still we are doing it for experimental preview, so it doesn't hurt to + // do the same here. + AbstractStabilityServerSetupTaskTest.addSystemProperty(managementClient, StabilityCommunityServerSetupTestCase.class); + } + } + +} diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/StabilityDefaultServerSetupTestCase.java b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/StabilityDefaultServerSetupTestCase.java new file mode 100644 index 000000000000..fe6afea45563 --- /dev/null +++ b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/StabilityDefaultServerSetupTestCase.java @@ -0,0 +1,33 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.jboss.as.test.smoke.stability; + +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.as.arquillian.api.ServerSetup; +import org.jboss.as.arquillian.container.ManagementClient; +import org.jboss.as.version.Stability; +import org.junit.runner.RunWith; +import org.wildfly.test.stabilitylevel.StabilityServerSetupSnapshotRestoreTasks; + +@ServerSetup(StabilityDefaultServerSetupTestCase.DefaultStabilitySetupTask.class) +@RunWith(Arquillian.class) +@RunAsClient +public class StabilityDefaultServerSetupTestCase extends AbstractStabilityServerSetupTaskTest { + public StabilityDefaultServerSetupTestCase() { + super(Stability.DEFAULT); + } + + public static class DefaultStabilitySetupTask extends StabilityServerSetupSnapshotRestoreTasks.Default { + @Override + protected void doSetup(ManagementClient managementClient) throws Exception { + // Not really needed since the resulting written xml will be of a higher stability level + // than the server. Still we are doing it for experimental preview, so it doesn't hurt to + // do the same here. + AbstractStabilityServerSetupTaskTest.addSystemProperty(managementClient, StabilityDefaultServerSetupTestCase.class); + } + } +} diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/StabilityExperimentalServerSetupTestCase.java b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/StabilityExperimentalServerSetupTestCase.java new file mode 100644 index 000000000000..bf5831865391 --- /dev/null +++ b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/StabilityExperimentalServerSetupTestCase.java @@ -0,0 +1,34 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.jboss.as.test.smoke.stability; + +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.as.arquillian.api.ServerSetup; +import org.jboss.as.arquillian.container.ManagementClient; +import org.jboss.as.version.Stability; +import org.junit.runner.RunWith; +import org.wildfly.test.stabilitylevel.StabilityServerSetupSnapshotRestoreTasks; + +@ServerSetup(StabilityExperimentalServerSetupTestCase.ExperimentalStabilitySetupTask.class) +@RunWith(Arquillian.class) +@RunAsClient +public class StabilityExperimentalServerSetupTestCase extends AbstractStabilityServerSetupTaskTest { + public StabilityExperimentalServerSetupTestCase() { + super(Stability.EXPERIMENTAL); + } + + + public static class ExperimentalStabilitySetupTask extends StabilityServerSetupSnapshotRestoreTasks.Experimental { + @Override + protected void doSetup(ManagementClient managementClient) throws Exception { + // Write a system property so the model ges stored with a lower stability level. + // This is to make sure we can reload back to the higher level from the snapshot + AbstractStabilityServerSetupTaskTest.addSystemProperty(managementClient, StabilityExperimentalServerSetupTestCase.class); + } + } + +} diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/StabilityPreviewServerSetupTestCase.java b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/StabilityPreviewServerSetupTestCase.java new file mode 100644 index 000000000000..7f61320f36fd --- /dev/null +++ b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/stability/StabilityPreviewServerSetupTestCase.java @@ -0,0 +1,34 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.jboss.as.test.smoke.stability; + +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.as.arquillian.api.ServerSetup; +import org.jboss.as.arquillian.container.ManagementClient; +import org.jboss.as.version.Stability; +import org.junit.runner.RunWith; +import org.wildfly.test.stabilitylevel.StabilityServerSetupSnapshotRestoreTasks; + +@ServerSetup(StabilityPreviewServerSetupTestCase.PreviewStabilitySetupTask.class) +@RunWith(Arquillian.class) +@RunAsClient +public class StabilityPreviewServerSetupTestCase extends AbstractStabilityServerSetupTaskTest { + public StabilityPreviewServerSetupTestCase() { + super(Stability.PREVIEW); + } + + + public static class PreviewStabilitySetupTask extends StabilityServerSetupSnapshotRestoreTasks.Preview { + @Override + protected void doSetup(ManagementClient managementClient) throws Exception { + // Write a system property so the model ges stored with a lower stability level. + // This is to make sure we can reload back to the higher level from the snapshot + AbstractStabilityServerSetupTaskTest.addSystemProperty(managementClient, StabilityPreviewServerSetupTestCase.class); + } + } + +} diff --git a/testsuite/shared/src/main/java/org/wildfly/test/stabilitylevel/StabilityServerSetupSnapshotRestoreTasks.java b/testsuite/shared/src/main/java/org/wildfly/test/stabilitylevel/StabilityServerSetupSnapshotRestoreTasks.java new file mode 100644 index 000000000000..00cf1bb0cbf2 --- /dev/null +++ b/testsuite/shared/src/main/java/org/wildfly/test/stabilitylevel/StabilityServerSetupSnapshotRestoreTasks.java @@ -0,0 +1,225 @@ +/* + * Copyright The WildFly Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.wildfly.test.stabilitylevel; + +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.CORE_SERVICE; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.NAME; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.READ_OPERATION_DESCRIPTION_OPERATION; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.READ_OPERATION_NAMES_OPERATION; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RELOAD_ENHANCED; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.STABILITY; +import static org.jboss.as.server.controller.descriptions.ServerDescriptionConstants.SERVER_ENVIRONMENT; +import static org.junit.Assert.fail; + +import java.io.File; +import java.util.HashSet; +import java.util.Set; + +import org.jboss.as.arquillian.api.ServerSetupTask; +import org.jboss.as.arquillian.container.ManagementClient; +import org.jboss.as.controller.PathAddress; +import org.jboss.as.controller.client.ModelControllerClient; +import org.jboss.as.controller.client.helpers.ClientConstants; +import org.jboss.as.controller.descriptions.ModelDescriptionConstants; +import org.jboss.as.controller.operations.common.Util; +import org.jboss.as.test.integration.management.ManagementOperations; +import org.jboss.as.test.integration.management.util.ServerReload; +import org.jboss.as.version.Stability; +import org.jboss.dmr.ModelNode; +import org.junit.Assert; +import org.junit.Assume; + +/** + * For tests that need to run under a specific server stability level, + * the server setup tasks from the inner classes can be used to change the stability level of the server to the desired level. + * Once the test is done, the original stability level is restored. + * + * In order to not pollute the configuration with XML from a different stability level following the run of the test, + * it takes a snapshot of the server configuration in the {@code setup()} method, and then restores to that snapshot in + * the {@code teardown()} method + */ +public abstract class StabilityServerSetupSnapshotRestoreTasks implements ServerSetupTask { + + private final Stability desiredStability; + private volatile Stability originalStability; + + private AutoCloseable snapshot; + + + public StabilityServerSetupSnapshotRestoreTasks(Stability desiredStability) { + this.desiredStability = desiredStability; + } + + @Override + public final void setup(ManagementClient managementClient, String containerId) throws Exception { + // Make sure the desired stability level is one of the ones supported by the server + Set<Stability> supportedStabilityLevels = getSupportedStabilityLevels(managementClient); + Assume.assumeTrue( + String.format("%s is not a supported stability level. Supported levels: %s", desiredStability, supportedStabilityLevels), + supportedStabilityLevels.contains(desiredStability)); + + // Check the reload-enhanced operation exists in the current stability level + Assume.assumeTrue( + "The reload-enhanced operation is not registered at this stability level", + checkReloadEnhancedOperationIsAvailable(managementClient)); + + // Check the reload-enhanced operation exists in the stability level we want to load to so that + // we can reload back to the current one + Stability reloadOpStability = getReloadEnhancedOperationStabilityLevel(managementClient); + Assume.assumeTrue(desiredStability.enables(reloadOpStability)); + + + + originalStability = readCurrentStability(managementClient.getControllerClient()); + + // Take a snapshot, indicating that when reloading we want to go back to the original stability + snapshot = takeSnapshot(managementClient, originalStability); + + // All good, let's do it! + reloadToDesiredStability(managementClient.getControllerClient(), desiredStability); + + // Do any additional setup from the sub-classes + doSetup(managementClient); + } + + protected void doSetup(ManagementClient managementClient) throws Exception { + + } + + @Override + public final void tearDown(ManagementClient managementClient, String containerId) throws Exception { + tearDown(managementClient); + snapshot.close(); + } + + public final void tearDown(ManagementClient managementClient) throws Exception { + + } + + private boolean checkReloadEnhancedOperationIsAvailable(ManagementClient managementClient) throws Exception { + ModelNode op = Util.createOperation(READ_OPERATION_NAMES_OPERATION, PathAddress.EMPTY_ADDRESS); + ModelNode result = ManagementOperations.executeOperation(managementClient.getControllerClient(), op); + for (ModelNode name : result.asList()) { + if (name.asString().equals(RELOAD_ENHANCED)) { + return true; + } + } + return false; + } + + private Stability getReloadEnhancedOperationStabilityLevel(ManagementClient managementClient) throws Exception { + ModelNode op = Util.createOperation(READ_OPERATION_DESCRIPTION_OPERATION, PathAddress.EMPTY_ADDRESS); + op.get(NAME).set(RELOAD_ENHANCED); + + ModelNode result = ManagementOperations.executeOperation(managementClient.getControllerClient(), op); + String stability = result.get(STABILITY).asString(); + return Stability.fromString(stability); + + } + private Set<Stability> getSupportedStabilityLevels(ManagementClient managementClient) throws Exception { + ModelNode op = Util.getReadAttributeOperation(PathAddress.pathAddress(CORE_SERVICE, SERVER_ENVIRONMENT), "permissible-stability-levels"); + ModelNode result = ManagementOperations.executeOperation(managementClient.getControllerClient(), op); + Set<Stability> set = new HashSet<>(); + for (ModelNode mn : result.asList()) { + set.add(Stability.fromString(mn.asString())); + } + return set; + } + + private Stability reloadToDesiredStability(ModelControllerClient client, Stability stability) throws Exception { + // Check the stability + Stability currentStability = readCurrentStability(client); + if (currentStability == stability) { + return originalStability; + } + + //Reload the server to the desired stability level + ServerReload.Parameters parameters = new ServerReload.Parameters() + .setStability(stability); + // Execute the reload + ServerReload.executeReloadAndWaitForCompletion(client, parameters); + + Stability reloadedStability = readCurrentStability(client); + Assert.assertEquals(stability, reloadedStability); + return originalStability; + } + + private Stability readCurrentStability(ModelControllerClient client) throws Exception { + ModelNode op = Util.getReadAttributeOperation(PathAddress.pathAddress(CORE_SERVICE, SERVER_ENVIRONMENT), STABILITY); + ModelNode result = ManagementOperations.executeOperation(client, op); + return Stability.fromString(result.asString()); + } + + /** + * A server setup task that sets the server stability to the default level. + */ + public static class Default extends StabilityServerSetupSnapshotRestoreTasks { + public Default() { + super(Stability.DEFAULT); + } + } + + /** + * A server setup task that sets the server stability to the community level. + */ + public static class Community extends StabilityServerSetupSnapshotRestoreTasks { + public Community() { + super(Stability.COMMUNITY); + } + } + + /** + * A server setup task that sets the server stability to the preview level. + */ + public static class Preview extends StabilityServerSetupSnapshotRestoreTasks { + public Preview() { + super(Stability.PREVIEW); + } + } + + /** + * A server setup task that sets the server stability to the experimental level. + */ + public static class Experimental extends StabilityServerSetupSnapshotRestoreTasks { + public Experimental() { + super(Stability.EXPERIMENTAL); + } + } + + // Temporary duplication until we have the needed hooks in SnapshotServerSetupTasks to reload to different stability levels + private static AutoCloseable takeSnapshot(ManagementClient client, Stability reloadToStability) { + try { + ModelNode node = new ModelNode(); + node.get(ModelDescriptionConstants.OP).set("take-snapshot"); + ModelNode result = client.getControllerClient().execute(node); + if (!"success".equals(result.get(ClientConstants.OUTCOME).asString())) { + fail("take-snapshot operation didn't finish successfully: " + result.asString()); + } + String snapshot = result.get(ModelDescriptionConstants.RESULT).asString(); + final String fileName = snapshot.contains(File.separator) ? snapshot.substring(snapshot.lastIndexOf(File.separator) + 1) : snapshot; + return new AutoCloseable() { + @Override + public void close() throws Exception { + ServerReload.Parameters parameters = new ServerReload.Parameters(); + parameters.setServerConfig(fileName); + if (reloadToStability != null) { + parameters.setStability(reloadToStability); + } + ServerReload.executeReloadAndWaitForCompletion(client.getControllerClient(), parameters); + + ModelNode node = new ModelNode(); + node.get(ModelDescriptionConstants.OP).set("write-config"); + ModelNode result = client.getControllerClient().execute(node); + if (!"success".equals(result.get(ClientConstants.OUTCOME).asString())) { + fail("Failed to write config after restoring from snapshot " + result.asString()); + } + } + }; + } catch (Exception e) { + throw new RuntimeException("Failed to take snapshot", e); + } + } +} From 60ce0bde538f9f8e5c3bda3adb5c2459b16f209c Mon Sep 17 00:00:00 2001 From: Kabir Khan <kkhan@redhat.com> Date: Mon, 29 Apr 2024 12:13:11 +0100 Subject: [PATCH 2/2] [WFLY-19286] We should only reload to lower stability levels, or the config might be incompatible with the higher one --- .../StabilityServerSetupSnapshotRestoreTasks.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testsuite/shared/src/main/java/org/wildfly/test/stabilitylevel/StabilityServerSetupSnapshotRestoreTasks.java b/testsuite/shared/src/main/java/org/wildfly/test/stabilitylevel/StabilityServerSetupSnapshotRestoreTasks.java index 00cf1bb0cbf2..89a6982e2845 100644 --- a/testsuite/shared/src/main/java/org/wildfly/test/stabilitylevel/StabilityServerSetupSnapshotRestoreTasks.java +++ b/testsuite/shared/src/main/java/org/wildfly/test/stabilitylevel/StabilityServerSetupSnapshotRestoreTasks.java @@ -72,9 +72,12 @@ public final void setup(ManagementClient managementClient, String containerId) t Assume.assumeTrue(desiredStability.enables(reloadOpStability)); - originalStability = readCurrentStability(managementClient.getControllerClient()); + // We only want to reload to lower stability levels (e.g. when running the ts.preview tests, that contains + // some configuration at 'preview' level, so the reload to 'community' fails + Assume.assumeTrue(desiredStability.enables(originalStability)); + // Take a snapshot, indicating that when reloading we want to go back to the original stability snapshot = takeSnapshot(managementClient, originalStability);