Skip to content

[1.4] MODCLUSTER-754 Modify ResetRequestSourceImpl to send STOP request whe… #714

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

Merged
rhusar merged 1 commit into from
Aug 2, 2023
Merged

[1.4] MODCLUSTER-754 Modify ResetRequestSourceImpl to send STOP request whe… #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion core/src/main/java/org/jboss/modcluster/mcmp/impl/ResetRequestSourceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,12 @@ public List<MCMPRequest> getResetRequests(Map<String, Set<VirtualHost>> response
: this.requestFactory.createDisableRequest(context));
}
} else {
if (status == ResetRequestSource.Status.ENABLED) {
if (status == ResetRequestSource.Status.ENABLED || status == null) {
// Two cases are handled here:
// 1. Context is not started, but proxy reports the context as ENABLED
// => send STOP request, so that proxy disables the context.
// 2. Context is not started, proxy is not aware of the context (status == null)
// => send STOP reqeust, so that proxy registers the context.
engineRequests.add(this.requestFactory.createStopRequest(context));
}
}
Expand Down
129 changes: 82 additions & 47 deletions core/src/test/java/org/jboss/modcluster/mcmp/ResetRequestSourceTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;

Expand All @@ -37,6 +38,7 @@
import org.jboss.modcluster.container.Server;
import org.jboss.modcluster.config.BalancerConfiguration;
import org.jboss.modcluster.config.NodeConfiguration;
import org.jboss.modcluster.mcmp.impl.DefaultMCMPHandler;
import org.jboss.modcluster.mcmp.impl.ResetRequestSourceImpl;
import org.junit.Test;

Expand All @@ -49,7 +51,17 @@ public class ResetRequestSourceTestCase {
private final BalancerConfiguration balancerConfig = mock(BalancerConfiguration.class);
private final MCMPRequestFactory requestFactory = mock(MCMPRequestFactory.class);

private ResetRequestSource source = new ResetRequestSourceImpl(this.nodeConfig, this.balancerConfig, this.requestFactory);
private final ResetRequestSource source = new ResetRequestSourceImpl(this.nodeConfig, this.balancerConfig, this.requestFactory);

private final MCMPRequest configRequest = mock(MCMPRequest.class);
private final MCMPRequest enableRequest = mock(MCMPRequest.class);
private final MCMPRequest disableRequest = mock(MCMPRequest.class);
private final MCMPRequest stopRequest = mock(MCMPRequest.class);

private static final String JVM_ROUTE = "host1";
private static final String HOST_NAME = "host";
private static final String ALIAS1 = "alias1";
private static final String ALIAS2 = "alias2";

@Test
public void getResetRequestsNoServer() {
Expand All @@ -64,53 +76,74 @@ public void getResetRequestsNoServer() {
}

@Test
public void getResetRequests() throws Exception {
Server server = mock(Server.class);
ContextFilter contextFilter = mock(ContextFilter.class);

this.source.init(server, contextFilter);

verifyNoInteractions(server);
public void getResetRequests() {
setupMocks(true, true);

Engine engine = mock(Engine.class);
Host host = mock(Host.class);
Context context = mock(Context.class);
Context excludedContext = mock(Context.class);
MCMPRequest configRequest = mock(MCMPRequest.class);
MCMPRequest contextRequest = mock(MCMPRequest.class);
List<MCMPRequest> requests = this.source.getResetRequests(Collections
.<String, Set<ResetRequestSource.VirtualHost>> emptyMap());

when(contextFilter.getExcludedContexts(host)).thenReturn(Collections.singleton("/excluded"));
when(contextFilter.isAutoEnableContexts()).thenReturn(true);
assertEquals(2, requests.size());

when(server.getEngines()).thenReturn(Collections.singleton(engine));
assertSame(this.configRequest, requests.get(0));
assertSame(this.enableRequest, requests.get(1));
}

when(this.requestFactory.createConfigRequest(engine, this.nodeConfig, this.balancerConfig)).thenReturn(configRequest);
@Test
public void getResetRequestsDisableContexts() {
setupMocks(false, true);

when(engine.getJvmRoute()).thenReturn("host1");
when(engine.getProxyConnector()).thenReturn(mock(Connector.class));
List<MCMPRequest> requests = this.source.getResetRequests(Collections
.<String, Set<ResetRequestSource.VirtualHost>> emptyMap());

when(engine.getHosts()).thenReturn(Collections.singleton(host));
when(host.getName()).thenReturn("host");
when(host.getAliases()).thenReturn(new TreeSet<String>(Arrays.asList("alias1", "alias2")));
when(host.getContexts()).thenReturn(Arrays.asList(context, excludedContext));
when(context.getPath()).thenReturn("/context");
when(context.isStarted()).thenReturn(true);
assertEquals(2, requests.size());

when(this.requestFactory.createEnableRequest(context)).thenReturn(contextRequest);
assertSame(configRequest, requests.get(0));
assertSame(disableRequest, requests.get(1));
}

when(excludedContext.getPath()).thenReturn("/excluded");
@Test
public void getResetRequestsContextStoppedNoProxyStatus() {
setupMocks(true, false);

List<MCMPRequest> requests = this.source.getResetRequests(Collections
.<String, Set<ResetRequestSource.VirtualHost>> emptyMap());

assertEquals(2, requests.size());

assertSame(configRequest, requests.get(0));
assertSame(contextRequest, requests.get(1));
assertSame(stopRequest, requests.get(1));
}

@Test
public void getResetRequestsContextStoppedProxyStatusEnabled() {
setupMocks(true, false);

Map<String, Set<ResetRequestSource.VirtualHost>> infoResponse = createInfoResponse(
ResetRequestSource.Status.ENABLED);

List<MCMPRequest> requests = this.source.getResetRequests(infoResponse);

assertEquals(2, requests.size());

assertSame(configRequest, requests.get(0));
assertSame(stopRequest, requests.get(1));
}

@Test
public void getResetRequestsDisableContexts() throws Exception {
public void getResetRequestsContextStartedProxyStatusDisabled() {
setupMocks(true, true);
Map<String, Set<ResetRequestSource.VirtualHost>> infoResponse = createInfoResponse(
ResetRequestSource.Status.DISABLED);

List<MCMPRequest> requests = this.source.getResetRequests(infoResponse);

assertEquals(2, requests.size());

assertSame(configRequest, requests.get(0));
assertSame(enableRequest, requests.get(1));
}

private void setupMocks(boolean autoEnableContexts, boolean contextsAreStarted) {
Server server = mock(Server.class);
ContextFilter contextFilter = mock(ContextFilter.class);

Expand All @@ -122,36 +155,38 @@ public void getResetRequestsDisableContexts() throws Exception {
Host host = mock(Host.class);
Context context = mock(Context.class);
Context excludedContext = mock(Context.class);
MCMPRequest configRequest = mock(MCMPRequest.class);
MCMPRequest contextRequest = mock(MCMPRequest.class);

when(contextFilter.getExcludedContexts(host)).thenReturn(Collections.singleton("/excluded"));
when(contextFilter.isAutoEnableContexts()).thenReturn(false);
when(contextFilter.isAutoEnableContexts()).thenReturn(autoEnableContexts);

when(server.getEngines()).thenReturn(Collections.singleton(engine));

when(this.requestFactory.createConfigRequest(engine, this.nodeConfig, this.balancerConfig)).thenReturn(configRequest);

when(engine.getJvmRoute()).thenReturn("host1");
when(engine.getJvmRoute()).thenReturn(JVM_ROUTE);
when(engine.getProxyConnector()).thenReturn(mock(Connector.class));

when(engine.getHosts()).thenReturn(Collections.singleton(host));
when(host.getName()).thenReturn("host");
when(host.getAliases()).thenReturn(new TreeSet<String>(Arrays.asList("alias1", "alias2")));
when(host.getName()).thenReturn(HOST_NAME);
when(host.getAliases()).thenReturn(new TreeSet<String>(Arrays.asList(HOST_NAME, ALIAS1, ALIAS2)));
when(host.getContexts()).thenReturn(Arrays.asList(context, excludedContext));
when(context.getPath()).thenReturn("/context");
when(context.isStarted()).thenReturn(true);
when(context.isStarted()).thenReturn(contextsAreStarted);

when(this.requestFactory.createDisableRequest(context)).thenReturn(contextRequest);
when(this.requestFactory.createConfigRequest(engine, this.nodeConfig, this.balancerConfig))
.thenReturn(this.configRequest);
when(this.requestFactory.createEnableRequest(context)).thenReturn(this.enableRequest);
when(this.requestFactory.createDisableRequest(context)).thenReturn(this.disableRequest);
when(this.requestFactory.createStopRequest(context)).thenReturn(this.stopRequest);

when(excludedContext.getPath()).thenReturn("/excluded");
}

List<MCMPRequest> requests = this.source.getResetRequests(Collections
.<String, Set<ResetRequestSource.VirtualHost>> emptyMap());

assertEquals(2, requests.size());

assertSame(configRequest, requests.get(0));
assertSame(contextRequest, requests.get(1));
private Map<String, Set<ResetRequestSource.VirtualHost>> createInfoResponse(ResetRequestSource.Status contextStatus) {
DefaultMCMPHandler.VirtualHostImpl virtualHost = new DefaultMCMPHandler.VirtualHostImpl();
virtualHost.getAliases().add(HOST_NAME);
virtualHost.getAliases().add(ALIAS1);
virtualHost.getAliases().add(ALIAS2);
virtualHost.getContexts().put("/context", contextStatus);
return Collections.singletonMap(JVM_ROUTE, Collections.singleton(virtualHost));
}

}