diff --git a/core/src/main/scala/org/apache/spark/deploy/history/EventLogFileWriters.scala b/core/src/main/scala/org/apache/spark/deploy/history/EventLogFileWriters.scala index f3bb6d5af335..990ab680f3aa 100644 --- a/core/src/main/scala/org/apache/spark/deploy/history/EventLogFileWriters.scala +++ b/core/src/main/scala/org/apache/spark/deploy/history/EventLogFileWriters.scala @@ -187,12 +187,7 @@ object EventLogFileWriter { } def nameForAppAndAttempt(appId: String, appAttemptId: Option[String]): String = { - val base = Utils.sanitizeDirName(appId) - if (appAttemptId.isDefined) { - base + "_" + Utils.sanitizeDirName(appAttemptId.get) - } else { - base - } + Utils.nameForAppAndAttempt(appId, appAttemptId) } def codecName(log: Path): Option[String] = { diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala b/core/src/main/scala/org/apache/spark/util/Utils.scala index 536c6b4447aa..1efe181a8c38 100644 --- a/core/src/main/scala/org/apache/spark/util/Utils.scala +++ b/core/src/main/scala/org/apache/spark/util/Utils.scala @@ -2954,6 +2954,15 @@ private[spark] object Utils str.replaceAll("[ :/]", "-").replaceAll("[.${}'\"]", "_").toLowerCase(Locale.ROOT) } + def nameForAppAndAttempt(appId: String, appAttemptId: Option[String]): String = { + val base = sanitizeDirName(appId) + if (appAttemptId.isDefined) { + base + "_" + sanitizeDirName(appAttemptId.get) + } else { + base + } + } + def isClientMode(conf: SparkConf): Boolean = { "client".equals(conf.get(SparkLauncher.DEPLOY_MODE, "client")) }