[streaming] Fixed error logging in streaming tasks.

shghatge · May 20, 2015 · 68f41a0 · 68f41a0
1 parent f27025b
commit 68f41a0
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 37 deletions.
diff --git a/...aming-core/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java b/...aming-core/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java
@@ -109,21 +109,22 @@ public void invoke() throws Exception {
 				LOG.debug("Task {} invocation finished", getName());
 			}
 
-		} catch (Exception e) {
-
+		}
+		catch (Exception e) {
+			LOG.error(getEnvironment().getTaskNameWithSubtasks() + " failed", e);
+
 			if (operatorOpen) {
 				try {
 					closeOperator();
-				} catch (Throwable t) {
-					LOG.info("Caught exception while closing operator.", e);
+				}
+				catch (Throwable t) {
+					LOG.warn("Exception while closing operator.", t);
 				}
 			}
-
-			if (LOG.isErrorEnabled()) {
-				LOG.error("StreamOperator failed.", e);
-			}
+
 			throw e;
-		} finally {
+		}
+		finally {
 			this.isRunning = false;
 			// Cleanup
 			inputs.clearBuffers();

diff --git a/...reaming-core/src/main/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTask.java b/...reaming-core/src/main/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTask.java
@@ -49,21 +49,21 @@ public void invoke() throws Exception {
 				LOG.debug("Task {} invocation finished", getName());
 			}
 
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
+			LOG.error(getEnvironment().getTaskNameWithSubtasks() + " failed", e);
 
 			if (operatorOpen) {
 				try {
 					closeOperator();
-				} catch (Throwable t) {
-					LOG.info("Caught exception while closing operator.", e);
 				}
-			}
-
-			if (LOG.isErrorEnabled()) {
-				LOG.error("StreamOperator failed.", e);
+				catch (Throwable t) {
+					LOG.warn("Exception while closing operator.", t);
+				}
 			}
 			throw e;
-		} finally {
+		}
+		finally {
 			this.isRunning = false;
 			// Cleanup
 			outputHandler.flushOutputs();

diff --git a/...ming-core/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamIterationHead.java b/...ming-core/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamIterationHead.java
@@ -25,7 +25,7 @@
 import org.apache.flink.streaming.api.collector.StreamOutput;
 import org.apache.flink.streaming.runtime.io.BlockingQueueBroker;
 import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
-import org.apache.flink.util.StringUtils;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -88,16 +88,16 @@ public void invoke() throws Exception {
 				}
 			}
 
-		} catch (Exception e) {
-			if (LOG.isErrorEnabled()) {
-				LOG.error("Iteration source failed due to: {}", StringUtils.stringifyException(e));
-			}
+		}
+		catch (Exception e) {
+			LOG.error("Iteration Head " + getEnvironment().getTaskNameWithSubtasks() + " failed", e);
+
 			throw e;
-		} finally {
+		}
+		finally {
 			// Cleanup
 			outputHandler.flushOutputs();
 			clearBuffers();
 		}
-
 	}
 }
diff --git a/...ming-core/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamIterationTail.java b/...ming-core/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamIterationTail.java
@@ -67,12 +67,12 @@ public void invoke() throws Exception {
 			if (LOG.isDebugEnabled()) {
 				LOG.debug("Iteration sink {} invoke finished", getName());
 			}
-		} catch (Exception e) {
-			if (LOG.isErrorEnabled()) {
-				LOG.error("Iteration sink failed due to: {}", StringUtils.stringifyException(e));
-			}
+		}
+		catch (Exception e) {
+			LOG.error("Iteration tail " + getEnvironment().getTaskNameWithSubtasks() + " failed", e);
 			throw e;
-		} finally {
+		}
+		finally {
 			// Cleanup
 			clearBuffers();
 		}

diff --git a/...aming-core/src/main/java/org/apache/flink/streaming/runtime/tasks/TwoInputStreamTask.java b/...aming-core/src/main/java/org/apache/flink/streaming/runtime/tasks/TwoInputStreamTask.java
@@ -30,6 +30,7 @@
 import org.apache.flink.streaming.runtime.io.InputGateFactory;
 import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
 import org.apache.flink.streaming.runtime.streamrecord.StreamRecordSerializer;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -99,21 +100,22 @@ public void invoke() throws Exception {
 				LOG.debug("Task {} invocation finished", getName());
 			}
 
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
+			LOG.error(getEnvironment().getTaskNameWithSubtasks() + " failed", e);
 
 			if (operatorOpen) {
 				try {
 					closeOperator();
-				} catch (Throwable t) {
-					LOG.info("Caught exception while closing operator.", e);
+				}
+				catch (Throwable t) {
+					LOG.warn("Exception while closing operator.", t);
 				}
 			}
-
-			if (LOG.isErrorEnabled()) {
-				LOG.error("StreamOperator failed. ", e);
-			}
+
 			throw e;
-		} finally {
+		}
+		finally {
 			this.isRunning = false;
 			// Cleanup
 			outputHandler.flushOutputs();