|
7 | 7 | import org.gradle.api.tasks.options.Option;
|
8 | 8 |
|
9 | 9 | import java.io.BufferedReader;
|
| 10 | +import java.io.Closeable; |
10 | 11 | import java.io.IOException;
|
11 | 12 | import java.nio.file.Files;
|
12 |
| -import java.util.HashSet; |
| 13 | +import java.util.ArrayList; |
| 14 | +import java.util.List; |
13 | 15 | import java.util.Map;
|
14 |
| -import java.util.Set; |
15 | 16 | import java.util.stream.Collectors;
|
16 | 17 |
|
17 | 18 | public class RunTask extends DefaultTestClustersTask {
|
@@ -66,17 +67,54 @@ public void beforeStart() {
|
66 | 67 |
|
67 | 68 | @TaskAction
|
68 | 69 | public void runAndWait() throws IOException {
|
69 |
| - Set<BufferedReader> toRead = new HashSet<>(); |
70 |
| - for (ElasticsearchCluster cluster : getClusters()) { |
71 |
| - for (ElasticsearchNode node : cluster.getNodes()) { |
72 |
| - toRead.add(Files.newBufferedReader(node.getEsStdoutFile())); |
| 70 | + List<BufferedReader> toRead = new ArrayList<>(); |
| 71 | + try { |
| 72 | + for (ElasticsearchCluster cluster : getClusters()) { |
| 73 | + for (ElasticsearchNode node : cluster.getNodes()) { |
| 74 | + BufferedReader reader = Files.newBufferedReader(node.getEsStdoutFile()); |
| 75 | + toRead.add(reader); |
| 76 | + } |
73 | 77 | }
|
74 |
| - } |
75 |
| - while (Thread.currentThread().isInterrupted() == false) { |
76 |
| - for (BufferedReader bufferedReader : toRead) { |
77 |
| - if (bufferedReader.ready()) { |
78 |
| - logger.lifecycle(bufferedReader.readLine()); |
| 78 | + |
| 79 | + while (Thread.currentThread().isInterrupted() == false) { |
| 80 | + boolean readData = false; |
| 81 | + for (BufferedReader bufferedReader : toRead) { |
| 82 | + if (bufferedReader.ready()) { |
| 83 | + readData = true; |
| 84 | + logger.lifecycle(bufferedReader.readLine()); |
| 85 | + } |
79 | 86 | }
|
| 87 | + |
| 88 | + if (readData == false) { |
| 89 | + // no data was ready to be consumed and rather than continuously spinning, pause |
| 90 | + // for some time to avoid excessive CPU usage. Ideally we would use the JDK |
| 91 | + // WatchService to receive change notifications but the WatchService does not have |
| 92 | + // a native MacOS implementation and instead relies upon polling with possible |
| 93 | + // delays up to 10s before a notification is received. See JDK-7133447. |
| 94 | + try { |
| 95 | + Thread.sleep(100L); |
| 96 | + } catch (InterruptedException e) { |
| 97 | + Thread.currentThread().interrupt(); |
| 98 | + return; |
| 99 | + } |
| 100 | + } |
| 101 | + } |
| 102 | + } finally { |
| 103 | + Exception thrown = null; |
| 104 | + for (Closeable closeable : toRead) { |
| 105 | + try { |
| 106 | + closeable.close(); |
| 107 | + } catch (Exception e) { |
| 108 | + if (thrown == null) { |
| 109 | + thrown = e; |
| 110 | + } else { |
| 111 | + thrown.addSuppressed(e); |
| 112 | + } |
| 113 | + } |
| 114 | + } |
| 115 | + |
| 116 | + if (thrown != null) { |
| 117 | + logger.debug("exception occurred during close of stdout file readers", thrown); |
80 | 118 | }
|
81 | 119 | }
|
82 | 120 | }
|
|
0 commit comments