Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11640 from jetty/fix/12.0.x/sh.state.site.delete 

Issue #11026 - fix `jetty.sh restart` flaw
This commit is contained in:
Joakim Erdfelt 2024-04-24 08:43:49 -05:00 committed by GitHub
parent 23ca73e833 0f30b74a94
commit 044a59ff6d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 107 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-home/src/main/resources/bin/jetty.sh
View File

@ -712,7 +712,7 @@ case "$ACTION" in
restart)
JETTY_SH=$0
> "$JETTY_STATE"
echo "restart" >> "$JETTY_STATE"
if [ ! -f $JETTY_SH ]; then
if [ ! -f $JETTY_HOME/bin/jetty.sh ]; then
echo "$JETTY_HOME/bin/jetty.sh does not exist."

106
tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/jettysh/JettyShStartTest.java
View File

@ -191,6 +191,112 @@ public class JettyShStartTest extends AbstractJettyHomeTest
}
}
@ParameterizedTest
@MethodSource("jettyImages")
public void testStartRestartStopJettyBase(ImageFromDSL jettyImage) throws Exception
{
ensureParentImagesExist(jettyImage);
try (GenericContainer<?> genericContainer = new GenericContainer<>(jettyImage))
{
genericContainer.withImagePullPolicy(PullPolicy.defaultPolicy());
genericContainer.setWaitStrategy(new ShellStrategy().withCommand("id"));
genericContainer.withExposedPorts(80, 8080) // jetty
.withCommand("/bin/sh", "-c", "while true; do pwd | nc -l -p 80; done")
.withStartupAttempts(2)
.withStartupCheckStrategy(new IsRunningStartupCheckStrategy())
.start();
LOG.info("Started: " + jettyImage.getDockerImageName());
System.err.println("== jetty.sh start ==");
Container.ExecResult result = genericContainer.execInContainer("/var/test/jetty-home/bin/jetty.sh", "start");
assertThat(result.getExitCode(), is(0));
/*
* Example successful output
* ----
* STDOUT:
* Starting Jetty: . started
* OK Wed Oct 18 19:29:35 UTC 2023
* ----
*/
Awaitility.await().atMost(Duration.ofSeconds(5)).until(result::getStdout,
allOf(
containsString("Starting Jetty:"),
containsString("\nOK ")
));
startHttpClient();
URI containerUriRoot = URI.create("http://" + genericContainer.getHost() + ":" + genericContainer.getMappedPort(8080) + "/");
LOG.debug("Container URI Root: {}", containerUriRoot);
System.err.println("== Attempt GET request to service ==");
ContentResponse response = client.GET(containerUriRoot);
assertEquals(HttpStatus.NOT_FOUND_404, response.getStatus(), new ResponseDetails(response));
assertThat(response.getContentAsString(), containsString("Powered by Eclipse Jetty:// Server"));
System.err.println("== jetty.sh status (should be running) ==");
result = genericContainer.execInContainer("/var/test/jetty-home/bin/jetty.sh", "status");
assertThat(result.getExitCode(), is(0));
Awaitility.await().atMost(Duration.ofSeconds(5)).until(result::getStdout,
containsString("Jetty running pid"));
System.err.println("== jetty.sh restart ==");
result = genericContainer.execInContainer("/var/test/jetty-home/bin/jetty.sh", "restart");
assertThat(result.getExitCode(), is(0));
Awaitility.await().atMost(Duration.ofSeconds(5)).until(result::getStdout,
allOf(
containsString("Starting Jetty:"),
containsString("\nOK ")
));
System.err.println("== Attempt GET request to service ==");
response = client.GET(containerUriRoot);
assertEquals(HttpStatus.NOT_FOUND_404, response.getStatus(), new ResponseDetails(response));
assertThat(response.getContentAsString(), containsString("Powered by Eclipse Jetty:// Server"));
System.err.println("== jetty.sh status (should be running) ==");
result = genericContainer.execInContainer("/var/test/jetty-home/bin/jetty.sh", "status");
assertThat(result.getExitCode(), is(0));
Awaitility.await().atMost(Duration.ofSeconds(5)).until(result::getStdout,
containsString("Jetty running pid"));
System.err.println("== jetty.sh stop ==");
result = genericContainer.execInContainer("/var/test/jetty-home/bin/jetty.sh", "stop");
assertThat(result.getExitCode(), is(0));
/* Looking for output from jetty.sh indicating a stopped jetty.
* STDOUT Example 1
* ----
* Stopping Jetty: OK\n
* ----
* STOUT Example 2
* ----
* Stopping Jetty: .Killed 12345\n
* OK\n
* ----
*/
Awaitility.await().atMost(Duration.ofSeconds(5)).until(result::getStdout,
matchesRegex("Stopping Jetty: .*[\n]?OK[\n]"));
System.err.println("== jetty.sh status (should be stopped) ==");
result = genericContainer.execInContainer("/var/test/jetty-home/bin/jetty.sh", "status");
assertThat(result.getExitCode(), is(1));
Awaitility.await().atMost(Duration.ofSeconds(5)).until(result::getStdout,
containsString("Jetty NOT running"));
System.err.println("== Attempt GET request to non-existent service ==");
client.setConnectTimeout(1000);
Exception failedGetException = assertThrows(Exception.class, () -> client.GET(containerUriRoot));
// GET failure can result in either exception below (which one is based on timing / race)
assertThat(failedGetException, anyOf(
instanceOf(ExecutionException.class),
instanceOf(AsynchronousCloseException.class))
);
}
}
private void ensureParentImagesExist(ImageFromDSL jettyImage)
{
// The build stack for images