Skip to content

Allow forked executor to finish with interactive stdin #54

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

Open
efegokdemir wants to merge 1 commit into
base: main
Choose a base branch
from
+38 −24
Open

Allow forked executor to finish with interactive stdin #54

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
41 changes: 17 additions & 24 deletions ...ecutor/src/main/java/org/apache/maven/executor/support/ProcessBuilderExecutorSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,37 +75,32 @@ protected ExecutorResult doExecuteProcess(ExecutorRequest execution, ProcessBuil
stdOut = execution.stdOut().orElse(IOTools.nullOutputStream());
stdErr = execution.stdErr().orElse(IOTools.nullOutputStream());
}
CountDownLatch outputPump = pump(process, stdIn, stdOut, stdErr);
boolean processFinished;
if (execution.executionTimeout().isPresent()) {
long timeoutMillis = execution
.executionTimeout()
.orElseThrow(() -> new NoSuchElementException("No such element"))
.toMillis();
if (pump(process, stdIn, stdOut, stdErr).await(timeoutMillis, TimeUnit.MILLISECONDS)) {
int exitCode = process.waitFor();
String stdOutString = null;
String stdErrString = null;
if (execution.grabOutputAsString()) {
// they are ByteArrayOutputStreams
stdOutString = stdOut.toString();
stdErrString = stdErr.toString();
}
return new SimpleExecutionResult(execution, exitCode == 0, exitCode, stdOutString, stdErrString);
} else {
processFinished = process.waitFor(timeoutMillis, TimeUnit.MILLISECONDS);
if (!processFinished) {
process.destroyForcibly();
throw new ExecutorException("Process timeout: " + execution);
}
} else {
pump(process, stdIn, stdOut, stdErr).await();
int exitCode = process.waitFor();
String stdOutString = null;
String stdErrString = null;
if (execution.grabOutputAsString()) {
// they are ByteArrayOutputStreams
stdOutString = stdOut.toString();
stdErrString = stdErr.toString();
}
return new SimpleExecutionResult(execution, exitCode == 0, exitCode, stdOutString, stdErrString);
process.waitFor();
}
process.getOutputStream().close();
outputPump.await();
int exitCode = process.exitValue();
String stdOutString = null;
String stdErrString = null;
if (execution.grabOutputAsString()) {
// they are ByteArrayOutputStreams
stdOutString = stdOut.toString();
stdErrString = stdErr.toString();
}
return new SimpleExecutionResult(execution, exitCode == 0, exitCode, stdOutString, stdErrString);
} catch (IOException e) {
if (process != null) {
process.destroyForcibly();
Expand All @@ -118,7 +113,7 @@ protected ExecutorResult doExecuteProcess(ExecutorRequest execution, ProcessBuil
}

protected CountDownLatch pump(Process p, InputStream stdIn, OutputStream stdOut, OutputStream stdErr) {
CountDownLatch latch = new CountDownLatch(3);
CountDownLatch latch = new CountDownLatch(2);
String suffix = "-pump-" + ThreadLocalRandom.current().nextInt();
Thread stdoutPump = new Thread(() -> {
try (OutputStream stdout = stdOut) {
Expand Down Expand Up @@ -152,8 +147,6 @@ protected CountDownLatch pump(Process p, InputStream stdIn, OutputStream stdOut,
in.flush();
} catch (IOException e) {
throw new UncheckedIOException(e);
} finally {
latch.countDown();
}
});
stdinPump.setName("stdin" + suffix);
Expand Down
21 changes: 21 additions & 0 deletions maven-executor/src/test/java/org/apache/maven/executor/forked/ForkedMavenExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,37 @@
*/
package org.apache.maven.executor.forked;

import java.io.PipedInputStream;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.Duration;
import java.util.NoSuchElementException;

import org.apache.maven.executor.Environment;
import org.apache.maven.executor.Executor;
import org.apache.maven.executor.ExecutorResult;
import org.apache.maven.executor.MavenExecutorTestSupport;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertEquals;

/**
* Forked executor UT
*/
public class ForkedMavenExecutorTest extends MavenExecutorTestSupport {

@Test
void doesNotWaitForInteractiveStdinAfterProcessExits() throws Exception {
ExecutorResult result = createAndMemoizeExecutor(Paths.get(Environment.MAVEN4_HOME))
.execute(customizedRequest()
.argument("-version")
.stdIn(new PipedInputStream())
.executionTimeout(Duration.ofSeconds(10))
.build());

assertEquals(0, result.exitCode().orElseThrow(NoSuchElementException::new));
}

@Override
protected Executor doSelectExecutor(Path installationDirectory) {
return new ForkedMavenExecutor(installationDirectory);
Expand Down