You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2019/04/05 08:28:45 UTC
[flink] branch master updated: [FLINK-12112][tests] Properly print
process output
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new bf62427 [FLINK-12112][tests] Properly print process output
bf62427 is described below
commit bf62427cc13cdb427172d22d427d3563694fcbc4
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Thu Apr 4 16:05:24 2019 +0200
[FLINK-12112][tests] Properly print process output
---
...tractTaskManagerProcessFailureRecoveryTest.java | 38 ++++++++++++----------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractTaskManagerProcessFailureRecoveryTest.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractTaskManagerProcessFailureRecoveryTest.java
index ea55939..9dd4542 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractTaskManagerProcessFailureRecoveryTest.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractTaskManagerProcessFailureRecoveryTest.java
@@ -194,16 +194,16 @@ public abstract class AbstractTaskManagerProcessFailureRecoveryTest extends Test
}
catch (Exception e) {
e.printStackTrace();
- printProcessLog("TaskManager 1", taskManagerProcess1.getOutput().toString());
- printProcessLog("TaskManager 2", taskManagerProcess1.getOutput().toString());
- printProcessLog("TaskManager 3", taskManagerProcess1.getOutput().toString());
+ printProcessLog("TaskManager 1", taskManagerProcess1);
+ printProcessLog("TaskManager 2", taskManagerProcess2);
+ printProcessLog("TaskManager 3", taskManagerProcess3);
fail(e.getMessage());
}
catch (Error e) {
e.printStackTrace();
- printProcessLog("TaskManager 1", taskManagerProcess1.getOutput().toString());
- printProcessLog("TaskManager 2", taskManagerProcess1.getOutput().toString());
- printProcessLog("TaskManager 3", taskManagerProcess1.getOutput().toString());
+ printProcessLog("TaskManager 1", taskManagerProcess1);
+ printProcessLog("TaskManager 2", taskManagerProcess2);
+ printProcessLog("TaskManager 3", taskManagerProcess3);
throw e;
}
finally {
@@ -230,7 +230,7 @@ public abstract class AbstractTaskManagerProcessFailureRecoveryTest extends Test
if (!process.getProcess().waitFor(30, TimeUnit.SECONDS)) {
log.error("{} did not shutdown in time.", processName);
- printProcessLog(processName, process.getOutput().toString());
+ printProcessLog(processName, process);
process.getProcess().destroyForcibly();
}
}
@@ -245,18 +245,20 @@ public abstract class AbstractTaskManagerProcessFailureRecoveryTest extends Test
*/
public abstract void testTaskManagerFailure(Configuration configuration, File coordinateDir) throws Exception;
- protected static void printProcessLog(String processName, String log) {
- if (log == null || log.length() == 0) {
- return;
+ protected static void printProcessLog(String processName, TestProcess process) {
+ if (process == null) {
+ System.out.println("-----------------------------------------");
+ System.out.println(" PROCESS " + processName + " WAS NOT STARTED.");
+ System.out.println("-----------------------------------------");
+ } else {
+ System.out.println("-----------------------------------------");
+ System.out.println(" BEGIN SPAWNED PROCESS LOG FOR " + processName);
+ System.out.println("-----------------------------------------");
+ System.out.println(process.getOutput().toString());
+ System.out.println("-----------------------------------------");
+ System.out.println(" END SPAWNED PROCESS LOG");
+ System.out.println("-----------------------------------------");
}
-
- System.out.println("-----------------------------------------");
- System.out.println(" BEGIN SPAWNED PROCESS LOG FOR " + processName);
- System.out.println("-----------------------------------------");
- System.out.println(log);
- System.out.println("-----------------------------------------");
- System.out.println(" END SPAWNED PROCESS LOG");
- System.out.println("-----------------------------------------");
}
protected static void touchFile(File file) throws IOException {