Repository: flink Updated Branches: refs/heads/release-0.9 8232809e1 -> c4f3f4886
[FLINK-2224] Log error cause in JobStatusChange Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c4f3f488 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c4f3f488 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c4f3f488 Branch: refs/heads/release-0.9 Commit: c4f3f48865626a67325c5c9161e70196e5f0816b Parents: 8232809 Author: Ufuk Celebi <[email protected]> Authored: Mon Jun 15 17:22:38 2015 +0200 Committer: Ufuk Celebi <[email protected]> Committed: Mon Jun 15 17:22:38 2015 +0200 ---------------------------------------------------------------------- .../src/main/resources/log4j-test.properties | 6 +++++- .../org/apache/flink/runtime/jobmanager/JobManager.scala | 9 ++++----- 2 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/c4f3f488/flink-examples/flink-java-examples/src/main/resources/log4j-test.properties ---------------------------------------------------------------------- diff --git a/flink-examples/flink-java-examples/src/main/resources/log4j-test.properties b/flink-examples/flink-java-examples/src/main/resources/log4j-test.properties index 2fb9345..65bd0b8 100644 --- a/flink-examples/flink-java-examples/src/main/resources/log4j-test.properties +++ b/flink-examples/flink-java-examples/src/main/resources/log4j-test.properties @@ -16,4 +16,8 @@ # limitations under the License. ################################################################################ -log4j.rootLogger=OFF \ No newline at end of file +log4j.rootLogger=INFO, console + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p %-60c %x - %m%n \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flink/blob/c4f3f488/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala index d5df633..c917d4a 100644 --- a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala +++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala @@ -30,14 +30,12 @@ import org.apache.flink.core.io.InputSplitAssigner import org.apache.flink.runtime.accumulators.StringifiedAccumulatorResult import org.apache.flink.runtime.blob.BlobServer import org.apache.flink.runtime.client._ -import org.apache.flink.runtime.execution.ExecutionState import org.apache.flink.runtime.executiongraph.{ExecutionJobVertex, ExecutionGraph} import org.apache.flink.runtime.jobmanager.web.WebInfoServer import org.apache.flink.runtime.messages.ArchiveMessages.ArchiveExecutionGraph import org.apache.flink.runtime.messages.ExecutionGraphMessages.JobStatusChanged import org.apache.flink.runtime.messages.Messages.{Disconnect, Acknowledge} -import org.apache.flink.runtime.messages.TaskMessages -import org.apache.flink.runtime.messages.TaskMessages.{FailTask, PartitionState, UpdateTaskExecutionState} +import org.apache.flink.runtime.messages.TaskMessages.{PartitionState, UpdateTaskExecutionState} import org.apache.flink.runtime.messages.accumulators._ import org.apache.flink.runtime.messages.checkpoint.{AcknowledgeCheckpoint, AbstractCheckpointMessage} import org.apache.flink.runtime.process.ProcessReaper @@ -287,8 +285,9 @@ class JobManager(protected val flinkConfiguration: Configuration, case JobStatusChanged(jobID, newJobStatus, timeStamp, error) => currentJobs.get(jobID) match { case Some((executionGraph, jobInfo)) => executionGraph.getJobName - log.info(s"Status of job $jobID (${executionGraph.getJobName}) changed to $newJobStatus" + - s" ${if (error == null) "" else error.getMessage}.") + + log.info(s"Status of job $jobID (${executionGraph.getJobName}) changed to $newJobStatus.", + error) if (newJobStatus.isTerminalState) { jobInfo.end = timeStamp
