Repository: spark Updated Branches: refs/heads/branch-1.6 0978ec11c -> a8c6d8acc
[SPARK-12053][CORE] EventLoggingListener.getLogPath needs 4 parameters ```EventLoggingListener.getLogPath``` needs 4 input arguments: https://github.com/apache/spark/blob/v1.6.0-preview2/core/src/main/scala/org/apache/spark/scheduler/EventLoggingListener.scala#L276-L280 the 3rd parameter should be appAttemptId, 4th parameter is codec... Author: Teng Qiu <[email protected]> Closes #10044 from chutium/SPARK-12053. (cherry picked from commit a8ceec5e8c1572dd3d74783c06c78b7ca0b8a7ce) Signed-off-by: Kousuke Saruta <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a8c6d8ac Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a8c6d8ac Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a8c6d8ac Branch: refs/heads/branch-1.6 Commit: a8c6d8accae7712568f583792ed2c0a3fce06776 Parents: 0978ec1 Author: Teng Qiu <[email protected]> Authored: Tue Dec 1 07:27:32 2015 +0900 Committer: Kousuke Saruta <[email protected]> Committed: Tue Dec 1 07:28:02 2015 +0900 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/deploy/master/Master.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/a8c6d8ac/core/src/main/scala/org/apache/spark/deploy/master/Master.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala index 9952c97..1355e1a 100644 --- a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala +++ b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala @@ -934,7 +934,7 @@ private[deploy] class Master( } val eventLogFilePrefix = EventLoggingListener.getLogPath( - eventLogDir, app.id, app.desc.eventLogCodec) + eventLogDir, app.id, appAttemptId = None, compressionCodecName = app.desc.eventLogCodec) val fs = Utils.getHadoopFileSystem(eventLogDir, hadoopConf) val inProgressExists = fs.exists(new Path(eventLogFilePrefix + EventLoggingListener.IN_PROGRESS)) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
