Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WFLY-14971 Fix intermittent failures with singleton deployment tests #15902

Closed
wants to merge 5 commits into from
Closed

WFLY-14971 Fix intermittent failures with singleton deployment tests #15902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
60448ae
WFLY-16775 Modifications to the preferences attribute of a singleton …
pferraro Aug 9, 2022
ebfa670
Implement toString().
pferraro Aug 9, 2022
ab8a712
Migrate test to use ManagementServerSetupTask.
pferraro Aug 9, 2022
025dbe4
Leverage try-with-resources.
pferraro Aug 9, 2022
e294225
Use immutable lists.
pferraro Aug 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...singleton/api/src/main/java/org/wildfly/clustering/singleton/election/NamePreference.java
View file
Open in desktop
Expand Up @@ -34,4 +34,9 @@ public NamePreference(String name) {
public boolean preferred(Node node) {
return node.getName().equals(this.name);
}

@Override
public String toString() {
return this.name;
}
}
5 changes: 5 additions & 0 deletions .../api/src/main/java/org/wildfly/clustering/singleton/election/SocketAddressPreference.java
View file
Open in desktop
Expand Up @@ -36,4 +36,9 @@ public SocketAddressPreference(InetSocketAddress address) {
public boolean preferred(Node node) {
return node.getSocketAddress().getAddress().getHostAddress().equals(this.address.getAddress().getHostAddress()) && (node.getSocketAddress().getPort() == this.address.getPort());
}

@Override
public String toString() {
return this.address.toString();
}
}
33 changes: 17 additions & 16 deletions ...ain/java/org/wildfly/extension/clustering/singleton/ElectionPolicyResourceDefinition.java
View file
Open in desktop
Expand Up @@ -34,11 +34,11 @@
import org.jboss.as.clustering.controller.SimpleResourceServiceHandler;
import org.jboss.as.clustering.controller.UnaryCapabilityNameResolver;
import org.jboss.as.controller.AttributeDefinition;
import org.jboss.as.controller.CapabilityReferenceRecorder;
import org.jboss.as.controller.PathElement;
import org.jboss.as.controller.StringListAttributeDefinition;
import org.jboss.as.controller.capability.RuntimeCapability;
import org.jboss.as.controller.descriptions.ResourceDescriptionResolver;
import org.jboss.as.controller.registry.AttributeAccess;
import org.jboss.as.controller.registry.ManagementResourceRegistration;
import org.wildfly.clustering.singleton.SingletonElectionPolicy;

Expand Down Expand Up @@ -69,20 +69,24 @@ public RuntimeCapability<Void> getDefinition() {
}
}

enum Attribute implements org.jboss.as.clustering.controller.Attribute {
enum Attribute implements org.jboss.as.clustering.controller.Attribute, UnaryOperator<StringListAttributeDefinition.Builder> {
NAME_PREFERENCES("name-preferences", "socket-binding-preferences"),
SOCKET_BINDING_PREFERENCES("socket-binding-preferences", "name-preferences", new CapabilityReference(Capability.ELECTION_POLICY, CommonUnaryRequirement.OUTBOUND_SOCKET_BINDING)),
SOCKET_BINDING_PREFERENCES("socket-binding-preferences", "name-preferences") {
@Override
public StringListAttributeDefinition.Builder apply(StringListAttributeDefinition.Builder builder) {
return builder.setAllowExpression(false)
.setCapabilityReference(new CapabilityReference(Capability.ELECTION_POLICY, CommonUnaryRequirement.OUTBOUND_SOCKET_BINDING))
;
}
}
;
private final AttributeDefinition definition;

Attribute(String name, String alternative) {
this.definition = createBuilder(name, alternative).build();
}

Attribute(String name, String alternative, CapabilityReferenceRecorder reference) {
this.definition = createBuilder(name, alternative)
.setAllowExpression(false)
.setCapabilityReference(reference)
this.definition = this.apply(new StringListAttributeDefinition.Builder(name).setAllowExpression(true))
.setAlternatives(alternative)
.setRequired(false)
.setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
.build();
}

Expand All @@ -91,12 +95,9 @@ public AttributeDefinition getDefinition() {
return this.definition;
}

private static StringListAttributeDefinition.Builder createBuilder(String name, String alternative) {
return new StringListAttributeDefinition.Builder(name)
.setAllowExpression(true)
.setRequired(false)
.setAlternatives(alternative)
;
@Override
public StringListAttributeDefinition.Builder apply(StringListAttributeDefinition.Builder builder) {
return builder;
}
}

Expand Down
83 changes: 28 additions & 55 deletions ...test/java/org/jboss/as/test/clustering/cluster/singleton/SingletonDeploymentTestCase.java
View file
Open in desktop
Expand Up @@ -26,15 +26,14 @@

import java.net.URI;
import java.net.URL;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;

import jakarta.servlet.http.HttpServletResponse;

import org.apache.http.HttpResponse;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.utils.HttpClientUtils;
import org.apache.http.impl.client.CloseableHttpClient;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.OperateOnDeployment;
Expand All @@ -46,7 +45,7 @@
import org.jboss.as.test.clustering.cluster.AbstractClusteringTestCase;
import org.jboss.as.test.clustering.cluster.singleton.servlet.TraceServlet;
import org.jboss.as.test.http.util.TestHttpClientUtils;
import org.jboss.as.test.shared.CLIServerSetupTask;
import org.jboss.as.test.shared.ManagementServerSetupTask;
import org.jboss.as.test.shared.TimeoutUtil;
import org.jboss.dmr.ModelNode;
import org.jboss.shrinkwrap.api.Archive;
Expand Down Expand Up @@ -116,27 +115,21 @@ public void test(

Assert.assertEquals(NODE_1, execute(client1, primaryProviderRequest).asStringOrNull());
Assert.assertTrue(execute(client1, isPrimaryRequest).asBoolean(false));
Assert.assertEquals(Arrays.asList(NODE_1, NODE_2), execute(client1, getProvidersRequest).asList().stream().map(ModelNode::asString).sorted().collect(Collectors.toList()));
Assert.assertEquals(List.of(NODE_1, NODE_2), execute(client1, getProvidersRequest).asList().stream().map(ModelNode::asString).sorted().collect(Collectors.toList()));
Assert.assertEquals(NODE_1, execute(client2, primaryProviderRequest).asStringOrNull());
Assert.assertFalse(execute(client2, isPrimaryRequest).asBoolean(true));
Assert.assertEquals(Arrays.asList(NODE_1, NODE_2), execute(client2, getProvidersRequest).asList().stream().map(ModelNode::asString).sorted().collect(Collectors.toList()));
Assert.assertEquals(List.of(NODE_1, NODE_2), execute(client2, getProvidersRequest).asList().stream().map(ModelNode::asString).sorted().collect(Collectors.toList()));

URI uri1 = TraceServlet.createURI(new URL(baseURL1.getProtocol(), baseURL1.getHost(), baseURL1.getPort(), "/" + this.moduleName + "/"));
URI uri2 = TraceServlet.createURI(new URL(baseURL2.getProtocol(), baseURL2.getHost(), baseURL2.getPort(), "/" + this.moduleName + "/"));

try (CloseableHttpClient client = TestHttpClientUtils.promiscuousCookieHttpClient()) {
HttpResponse response = client.execute(new HttpGet(uri1));
try {
try (CloseableHttpResponse response = client.execute(new HttpGet(uri1))) {
Assert.assertEquals(HttpServletResponse.SC_OK, response.getStatusLine().getStatusCode());
} finally {
HttpClientUtils.closeQuietly(response);
}

response = client.execute(new HttpGet(uri2));
try {
try (CloseableHttpResponse response = client.execute(new HttpGet(uri2))) {
Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, response.getStatusLine().getStatusCode());
} finally {
HttpClientUtils.closeQuietly(response);
}

this.undeploy(SINGLETON_DEPLOYMENT_1);
Expand All @@ -147,18 +140,12 @@ public void test(
Assert.assertTrue(execute(client2, isPrimaryRequest).asBoolean(false));
Assert.assertEquals(Collections.singletonList(NODE_2), execute(client2, getProvidersRequest).asList().stream().map(ModelNode::asString).collect(Collectors.toList()));

response = client.execute(new HttpGet(uri1));
try {
try (CloseableHttpResponse response = client.execute(new HttpGet(uri1))) {
Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, response.getStatusLine().getStatusCode());
} finally {
HttpClientUtils.closeQuietly(response);
}

response = client.execute(new HttpGet(uri2));
try {
try (CloseableHttpResponse response = client.execute(new HttpGet(uri2))) {
Assert.assertEquals(HttpServletResponse.SC_OK, response.getStatusLine().getStatusCode());
} finally {
HttpClientUtils.closeQuietly(response);
}

this.deploy(SINGLETON_DEPLOYMENT_1);
Expand All @@ -167,23 +154,17 @@ public void test(

Assert.assertEquals(NODE_1, execute(client1, primaryProviderRequest).asStringOrNull());
Assert.assertTrue(execute(client1, isPrimaryRequest).asBoolean(false));
Assert.assertEquals(Arrays.asList(NODE_1, NODE_2), execute(client1, getProvidersRequest).asList().stream().map(ModelNode::asString).sorted().collect(Collectors.toList()));
Assert.assertEquals(List.of(NODE_1, NODE_2), execute(client1, getProvidersRequest).asList().stream().map(ModelNode::asString).sorted().collect(Collectors.toList()));
Assert.assertEquals(NODE_1, execute(client2, primaryProviderRequest).asStringOrNull());
Assert.assertFalse(execute(client2, isPrimaryRequest).asBoolean(true));
Assert.assertEquals(Arrays.asList(NODE_1, NODE_2), execute(client2, getProvidersRequest).asList().stream().map(ModelNode::asString).sorted().collect(Collectors.toList()));
Assert.assertEquals(List.of(NODE_1, NODE_2), execute(client2, getProvidersRequest).asList().stream().map(ModelNode::asString).sorted().collect(Collectors.toList()));

response = client.execute(new HttpGet(uri1));
try {
try (CloseableHttpResponse response = client.execute(new HttpGet(uri1))) {
Assert.assertEquals(HttpServletResponse.SC_OK, response.getStatusLine().getStatusCode());
} finally {
HttpClientUtils.closeQuietly(response);
}

response = client.execute(new HttpGet(uri2));
try {
try (CloseableHttpResponse response = client.execute(new HttpGet(uri2))) {
Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, response.getStatusLine().getStatusCode());
} finally {
HttpClientUtils.closeQuietly(response);
}

this.undeploy(SINGLETON_DEPLOYMENT_2);
Expand All @@ -194,18 +175,12 @@ public void test(
Assert.assertTrue(execute(client1, isPrimaryRequest).asBoolean(false));
Assert.assertEquals(Collections.singletonList(NODE_1), execute(client1, getProvidersRequest).asList().stream().map(ModelNode::asString).collect(Collectors.toList()));

response = client.execute(new HttpGet(uri1));
try {
try (CloseableHttpResponse response = client.execute(new HttpGet(uri1))) {
Assert.assertEquals(HttpServletResponse.SC_OK, response.getStatusLine().getStatusCode());
} finally {
HttpClientUtils.closeQuietly(response);
}

response = client.execute(new HttpGet(uri2));
try {
try (CloseableHttpResponse response = client.execute(new HttpGet(uri2))) {
Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, response.getStatusLine().getStatusCode());
} finally {
HttpClientUtils.closeQuietly(response);
}

this.deploy(SINGLETON_DEPLOYMENT_2);
Expand All @@ -214,23 +189,17 @@ public void test(

Assert.assertEquals(NODE_1, execute(client1, primaryProviderRequest).asStringOrNull());
Assert.assertTrue(execute(client1, isPrimaryRequest).asBoolean(false));
Assert.assertEquals(Arrays.asList(NODE_1, NODE_2), execute(client1, getProvidersRequest).asList().stream().map(ModelNode::asString).sorted().collect(Collectors.toList()));
Assert.assertEquals(List.of(NODE_1, NODE_2), execute(client1, getProvidersRequest).asList().stream().map(ModelNode::asString).sorted().collect(Collectors.toList()));
Assert.assertEquals(NODE_1, execute(client2, primaryProviderRequest).asStringOrNull());
Assert.assertFalse(execute(client2, isPrimaryRequest).asBoolean(true));
Assert.assertEquals(Arrays.asList(NODE_1, NODE_2), execute(client2, getProvidersRequest).asList().stream().map(ModelNode::asString).sorted().collect(Collectors.toList()));
Assert.assertEquals(List.of(NODE_1, NODE_2), execute(client2, getProvidersRequest).asList().stream().map(ModelNode::asString).sorted().collect(Collectors.toList()));

response = client.execute(new HttpGet(uri1));
try {
try (CloseableHttpResponse response = client.execute(new HttpGet(uri1))) {
Assert.assertEquals(HttpServletResponse.SC_OK, response.getStatusLine().getStatusCode());
} finally {
HttpClientUtils.closeQuietly(response);
}

response = client.execute(new HttpGet(uri2));
try {
try (CloseableHttpResponse response = client.execute(new HttpGet(uri2))) {
Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, response.getStatusLine().getStatusCode());
} finally {
HttpClientUtils.closeQuietly(response);
}
} finally {
this.undeploy(SINGLETON_DEPLOYMENT_1);
Expand All @@ -240,12 +209,16 @@ public void test(
}
}

public static class ServerSetupTask extends CLIServerSetupTask {
public static class ServerSetupTask extends ManagementServerSetupTask {
ServerSetupTask() {
this.builder.node(TWO_NODES)
.setup("/subsystem=singleton/singleton-policy=default/election-policy=simple:write-attribute(name=name-preferences,value=%s)", Arrays.toString(TWO_NODES))
.teardown("/subsystem=singleton/singleton-policy=default/election-policy=simple:undefine-attribute(name=name-preferences)")
;
super(NODE_1_2, createContainerConfigurationBuilder()
.setupScript(createScriptBuilder()
.add("/subsystem=singleton/singleton-policy=default/election-policy=simple:write-attribute(name=name-preferences,value=%s){allow-resource-service-restart=true}", List.of(NODE_1, NODE_2))
.build())
.tearDownScript(createScriptBuilder()
.add("/subsystem=singleton/singleton-policy=default/election-policy=simple:undefine-attribute(name=name-preferences){allow-resource-service-restart=true}")
.build())
.build());
}
}
}