From 2f6e491e9e9d32d95f11854090c43cc88b7a86d4 Mon Sep 17 00:00:00 2001 From: Ufuk Celebi Date: Wed, 2 Nov 2016 10:28:12 +0100 Subject: [PATCH] [FLINK-4991] [taskmanager] Fix too aggressive timeout and improve logging in TaskTest --- .../main/java/org/apache/flink/runtime/taskmanager/Task.java | 3 +++ .../java/org/apache/flink/runtime/taskmanager/TaskTest.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java index 4b47cba4e1e30..ed15dbf3c1b08 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/Task.java @@ -1203,6 +1203,7 @@ public void run() { try { if (watchDogThread != null) { watchDogThread.start(); + logger.info("Started cancellation watch dog"); } // the user-defined cancel method may throw errors. @@ -1294,6 +1295,8 @@ public void run() { duration, bld.toString()); + logger.info("Notifying TaskManager about fatal error. {}.", msg); + taskManager.tell(new TaskManagerMessages.FatalError(msg, null)); return; // done, don't forget to leave the loop diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskTest.java index 56ab9c6edba6e..4aa80bda7a064 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskTest.java @@ -568,7 +568,7 @@ public void testOnPartitionStateUpdate() throws Exception { public void testWatchDogInterruptsTask() throws Exception { Configuration config = new Configuration(); config.setLong(ConfigConstants.TASK_CANCELLATION_INTERVAL_MILLIS, 5); - config.setLong(ConfigConstants.TASK_CANCELLATION_TIMEOUT_MILLIS, 50); + config.setLong(ConfigConstants.TASK_CANCELLATION_TIMEOUT_MILLIS, 60 * 1000); Task task = createTask(InvokableBlockingInCancel.class, config); task.startTaskThread();