[hotfix] [tests] Ignore ZooKeeper logs in process tests
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3a643c07 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3a643c07 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3a643c07 Branch: refs/heads/master Commit: 3a643c07792c62142c1f8cda172d4f4c3442c9b3 Parents: b8f4025 Author: Ufuk Celebi <u...@apache.org> Authored: Tue Feb 9 11:01:39 2016 +0100 Committer: Stephan Ewen <se...@apache.org> Committed: Wed Feb 10 15:27:16 2016 +0100 ---------------------------------------------------------------------- .../JobManagerSubmittedJobGraphsRecoveryITCase.java | 6 +++++- .../org/apache/flink/runtime/testutils/CommonTestUtils.java | 1 + .../AbstractJobManagerProcessFailureRecoveryITCase.java | 8 +++++--- .../org/apache/flink/test/recovery/ChaosMonkeyITCase.java | 4 ++++ .../test/recovery/JobManagerCheckpointRecoveryITCase.java | 8 ++++++++ 5 files changed, 23 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/3a643c07/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerSubmittedJobGraphsRecoveryITCase.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerSubmittedJobGraphsRecoveryITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerSubmittedJobGraphsRecoveryITCase.java index 99f7bd7..59c7c39 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerSubmittedJobGraphsRecoveryITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerSubmittedJobGraphsRecoveryITCase.java @@ -343,6 +343,10 @@ public class JobManagerSubmittedJobGraphsRecoveryITCase extends TestLogger { assertEquals(2, jobSubmitSuccessMessages); } catch (Throwable t) { + // Print early (in some situations the process logs get too big + // for Travis and the root problem is not shown) + t.printStackTrace(); + // In case of an error, print the job manager process logs. if (jobManagerProcess[0] != null) { jobManagerProcess[0].printProcessLog(); @@ -352,7 +356,7 @@ public class JobManagerSubmittedJobGraphsRecoveryITCase extends TestLogger { jobManagerProcess[1].printProcessLog(); } - t.printStackTrace(); + throw t; } finally { if (jobManagerProcess[0] != null) { http://git-wip-us.apache.org/repos/asf/flink/blob/3a643c07/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/CommonTestUtils.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/CommonTestUtils.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/CommonTestUtils.java index 069b6af..bbb6a89 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/CommonTestUtils.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/CommonTestUtils.java @@ -147,6 +147,7 @@ public class CommonTestUtils { writer.println("log4j.appender.console.layout=org.apache.log4j.PatternLayout"); writer.println("log4j.appender.console.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n"); writer.println("log4j.logger.org.eclipse.jetty.util.log=OFF"); + writer.println("log4j.logger.org.apache.zookeeper=OFF"); writer.flush(); writer.close(); http://git-wip-us.apache.org/repos/asf/flink/blob/3a643c07/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractJobManagerProcessFailureRecoveryITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractJobManagerProcessFailureRecoveryITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractJobManagerProcessFailureRecoveryITCase.java index 2f6b762..6122352 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractJobManagerProcessFailureRecoveryITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractJobManagerProcessFailureRecoveryITCase.java @@ -246,8 +246,10 @@ public abstract class AbstractJobManagerProcessFailureRecoveryITCase extends Tes fail("The program encountered a " + error.getClass().getSimpleName() + " : " + error.getMessage()); } } - catch (Exception e) { - e.printStackTrace(); + catch (Throwable t) { + // Print early (in some situations the process logs get too big + // for Travis and the root problem is not shown) + t.printStackTrace(); for (JobManagerProcess p : jmProcess) { if (p != null) { @@ -255,7 +257,7 @@ public abstract class AbstractJobManagerProcessFailureRecoveryITCase extends Tes } } - fail(e.getMessage()); + throw t; } finally { for (int i = 0; i < numberOfTaskManagers; i++) { http://git-wip-us.apache.org/repos/asf/flink/blob/3a643c07/flink-tests/src/test/java/org/apache/flink/test/recovery/ChaosMonkeyITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/ChaosMonkeyITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/ChaosMonkeyITCase.java index 6ae0d46..76f96ef 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/recovery/ChaosMonkeyITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/ChaosMonkeyITCase.java @@ -320,6 +320,10 @@ public class ChaosMonkeyITCase extends TestLogger { LOG.info("Recovery state clean"); } catch (Throwable t) { + // Print early (in some situations the process logs get too big + // for Travis and the root problem is not shown) + t.printStackTrace(); + System.out.println("#################################################"); System.out.println(" TASK MANAGERS"); System.out.println("#################################################"); http://git-wip-us.apache.org/repos/asf/flink/blob/3a643c07/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerCheckpointRecoveryITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerCheckpointRecoveryITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerCheckpointRecoveryITCase.java index 5d1b2c5..59a05ff 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerCheckpointRecoveryITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/JobManagerCheckpointRecoveryITCase.java @@ -248,6 +248,10 @@ public class JobManagerCheckpointRecoveryITCase extends TestLogger { } } catch (Throwable t) { + // Print early (in some situations the process logs get too big + // for Travis and the root problem is not shown) + t.printStackTrace(); + // In case of an error, print the job manager process logs. if (jobManagerProcess[0] != null) { jobManagerProcess[0].printProcessLog(); @@ -400,6 +404,10 @@ public class JobManagerCheckpointRecoveryITCase extends TestLogger { assertTrue("Did not find expected output in logs.", success); } catch (Throwable t) { + // Print early (in some situtations the process logs get too big + // for Travis and the root problem is not shown) + t.printStackTrace(); + // In case of an error, print the job manager process logs. if (jobManagerProcess[0] != null) { jobManagerProcess[0].printProcessLog();
