infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-11 22:19:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

8291760: PipelineLeaksFD.java still fails: More or fewer pipes than expected

Browse Source 
Reviewed-by: jpai, alanb
This commit is contained in:
Roger Riggs 2022-08-26 19:06:29 +00:00
parent 774edeb521
commit 4e457acda0
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/jdk/ProblemList.txt
View File

@ -493,7 +493,7 @@ java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java 8151492 generic-
java/lang/invoke/LFCaching/LFGarbageCollectedTest.java 8078602 generic-all
java/lang/invoke/lambda/LambdaFileEncodingSerialization.java 8249079 linux-x64
java/lang/invoke/RicochetTest.java 8251969 generic-all
java/lang/ProcessBuilder/PipelineLeaksFD.java 8291760 linux-all
jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java 8292051 generic-all
############################################################################

39
test/jdk/java/lang/ProcessBuilder/PipelineLeaksFD.java
View File

@ -25,10 +25,10 @@ import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Writer;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.HashSet;
@ -37,9 +37,9 @@ import java.util.Set;
/*
* @test
* @bug 8289643
* @bug 8289643 8291760
* @requires (os.family == "linux" & !vm.musl)
* @summary file descriptor leak with ProcessBuilder.startPipeline
* @summary File descriptor leak detection with ProcessBuilder.startPipeline
* @run testng/othervm PipelineLeaksFD
*/
@ -68,26 +68,27 @@ public class PipelineLeaksFD {
Assert.fail("There should be at least 3 pipes before, (0, 1, 2)");
}
// Redirect all of the error streams to stdout (except the last)
// so those file descriptors are not left open
for (int i = 0; i < builders.size() - 1; i++) {
builders.get(i).redirectErrorStream(true);
}
List<Process> processes = ProcessBuilder.startPipeline(builders);
// Write something through the pipeline
try (OutputStream out = processes.get(0).getOutputStream()) {
out.write('a');
final String text = "xyz";
try (Writer out = processes.get(0).outputWriter()) {
out.write(text);
}
Process last = processes.get(processes.size() - 1);
try (InputStream inputStream = last.getInputStream();
InputStream errorStream = last.getErrorStream()) {
byte[] bytes = inputStream.readAllBytes();
Assert.assertEquals(bytes.length, 1, "stdout bytes read");
byte[] errBytes = errorStream.readAllBytes();
Assert.assertEquals(errBytes.length, 0, "stderr bytes read");
// Read, check, and close all streams
for (int i = 0; i < processes.size(); i++) {
final Process p = processes.get(i);
String expectedOut = (i == processes.size() - 1) ? text : null;
String expectedErr = null; // EOF
try (BufferedReader inputStream = p.inputReader();
BufferedReader errorStream = p.errorReader()) {
String outActual = inputStream.readLine();
Assert.assertEquals(outActual, expectedOut, "stdout, process[ " + i + "]: " + p);
String errActual = errorStream.readLine();
Assert.assertEquals(errActual, expectedErr, "stderr, process[ " + i + "]: " + p);
}
}
processes.forEach(p -> waitForQuiet(p));