You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by jo...@apache.org on 2015/01/05 21:01:52 UTC
spark git commit: [SPARK-5057] Log message in failed askWithReply
attempts
Repository: spark
Updated Branches:
refs/heads/master d3f07fd23 -> ce39b3440
[SPARK-5057] Log message in failed askWithReply attempts
https://issues.apache.org/jira/browse/SPARK-5057
Author: WangTao <ba...@aliyun.com>
Author: WangTaoTheTonic <ba...@aliyun.com>
Closes #3875 from WangTaoTheTonic/SPARK-5057 and squashes the following commits:
1503487 [WangTao] use string interpolation
706c8a7 [WangTaoTheTonic] log more messages
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ce39b344
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ce39b344
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ce39b344
Branch: refs/heads/master
Commit: ce39b34404868de4ca51be06832169187b1aef7d
Parents: d3f07fd
Author: WangTao <ba...@aliyun.com>
Authored: Mon Jan 5 11:59:38 2015 -0800
Committer: Josh Rosen <jo...@databricks.com>
Committed: Mon Jan 5 12:00:02 2015 -0800
----------------------------------------------------------------------
.../main/scala/org/apache/spark/util/AkkaUtils.scala | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/ce39b344/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala b/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala
index 64e3a54..8d86fd3 100644
--- a/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala
+++ b/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala
@@ -89,7 +89,7 @@ private[spark] object AkkaUtils extends Logging {
}
val requireCookie = if (isAuthOn) "on" else "off"
val secureCookie = if (isAuthOn) secretKey else ""
- logDebug("In createActorSystem, requireCookie is: " + requireCookie)
+ logDebug(s"In createActorSystem, requireCookie is: $requireCookie")
val akkaConf = ConfigFactory.parseMap(conf.getAkkaConf.toMap[String, String]).withFallback(
ConfigFactory.parseString(
@@ -140,8 +140,8 @@ private[spark] object AkkaUtils extends Logging {
def maxFrameSizeBytes(conf: SparkConf): Int = {
val frameSizeInMB = conf.getInt("spark.akka.frameSize", 10)
if (frameSizeInMB > AKKA_MAX_FRAME_SIZE_IN_MB) {
- throw new IllegalArgumentException("spark.akka.frameSize should not be greater than "
- + AKKA_MAX_FRAME_SIZE_IN_MB + "MB")
+ throw new IllegalArgumentException(
+ s"spark.akka.frameSize should not be greater than $AKKA_MAX_FRAME_SIZE_IN_MB MB")
}
frameSizeInMB * 1024 * 1024
}
@@ -182,8 +182,8 @@ private[spark] object AkkaUtils extends Logging {
timeout: FiniteDuration): T = {
// TODO: Consider removing multiple attempts
if (actor == null) {
- throw new SparkException("Error sending message as actor is null " +
- "[message = " + message + "]")
+ throw new SparkException(s"Error sending message [message = $message]" +
+ " as actor is null ")
}
var attempts = 0
var lastException: Exception = null
@@ -200,13 +200,13 @@ private[spark] object AkkaUtils extends Logging {
case ie: InterruptedException => throw ie
case e: Exception =>
lastException = e
- logWarning("Error sending message in " + attempts + " attempts", e)
+ logWarning(s"Error sending message [message = $message] in $attempts attempts", e)
}
Thread.sleep(retryInterval)
}
throw new SparkException(
- "Error sending message [message = " + message + "]", lastException)
+ s"Error sending message [message = $message]", lastException)
}
def makeDriverRef(name: String, conf: SparkConf, actorSystem: ActorSystem): ActorRef = {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org