spark git commit: [SPARK-13280][STREAMING] Use a better logger name for FileBasedWriteAheadLog.

[va...@apache.org]

Repository: spark
Updated Branches:
  refs/heads/master 19dc69de7 -> c7d00a24d


[SPARK-13280][STREAMING] Use a better logger name for FileBasedWriteAheadLog.

The new logger name is under the org.apache.spark namespace.
The detection of the caller name was also enhanced a bit to ignore
some common things that show up in the call stack.

Author: Marcelo Vanzin <va...@cloudera.com>

Closes #11165 from vanzin/SPARK-13280.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c7d00a24
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c7d00a24
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c7d00a24

Branch: refs/heads/master
Commit: c7d00a24da317c9601a9239ac1cf185fb6647352
Parents: 19dc69d
Author: Marcelo Vanzin <va...@cloudera.com>
Authored: Tue Feb 16 11:25:43 2016 -0800
Committer: Marcelo Vanzin <va...@cloudera.com>
Committed: Tue Feb 16 11:25:43 2016 -0800

----------------------------------------------------------------------
 .../streaming/util/FileBasedWriteAheadLog.scala | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/c7d00a24/streaming/src/main/scala/org/apache/spark/streaming/util/FileBasedWriteAheadLog.scala
----------------------------------------------------------------------
diff --git a/streaming/src/main/scala/org/apache/spark/streaming/util/FileBasedWriteAheadLog.scala b/streaming/src/main/scala/org/apache/spark/streaming/util/FileBasedWriteAheadLog.scala
index 15ad2e2..314263f 100644
--- a/streaming/src/main/scala/org/apache/spark/streaming/util/FileBasedWriteAheadLog.scala
+++ b/streaming/src/main/scala/org/apache/spark/streaming/util/FileBasedWriteAheadLog.scala
@@ -57,12 +57,18 @@ private[streaming] class FileBasedWriteAheadLog(
   import FileBasedWriteAheadLog._
 
   private val pastLogs = new ArrayBuffer[LogInfo]
-  private val callerNameTag = getCallerName.map(c => s" for $c").getOrElse("")
+  private val callerName = getCallerName
 
-  private val threadpoolName = s"WriteAheadLogManager $callerNameTag"
+  private val threadpoolName = {
+    "WriteAheadLogManager" + callerName.map(c => s" for $c").getOrElse("")
+  }
   private val threadpool = ThreadUtils.newDaemonCachedThreadPool(threadpoolName, 20)
   private val executionContext = ExecutionContext.fromExecutorService(threadpool)
-  override protected val logName = s"WriteAheadLogManager $callerNameTag"
+
+  override protected def logName = {
+    getClass.getName.stripSuffix("$") +
+      callerName.map("_" + _).getOrElse("").replaceAll("[ ]", "_")
+  }
 
   private var currentLogPath: Option[String] = None
   private var currentLogWriter: FileBasedWriteAheadLogWriter = null
@@ -253,8 +259,12 @@ private[streaming] object FileBasedWriteAheadLog {
   }
 
   def getCallerName(): Option[String] = {
-    val stackTraceClasses = Thread.currentThread.getStackTrace().map(_.getClassName)
-    stackTraceClasses.find(!_.contains("WriteAheadLog")).flatMap(_.split("\\.").lastOption)
+    val blacklist = Seq("WriteAheadLog", "Logging", "java.lang", "scala.")
+    Thread.currentThread.getStackTrace()
+      .map(_.getClassName)
+      .find { c => !blacklist.exists(c.contains) }
+      .flatMap(_.split("\\.").lastOption)
+      .flatMap(_.split("\\$\\$").headOption)
   }
 
   /** Convert a sequence of files to a sequence of sorted LogInfo objects */


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org