You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/12/01 09:33:06 UTC
spark git commit: [SPARK-4664][Core] Throw an exception when
spark.akka.frameSize > 2047
Repository: spark
Updated Branches:
refs/heads/master 6384f42ab -> 1d238f221
[SPARK-4664][Core] Throw an exception when spark.akka.frameSize > 2047
If `spark.akka.frameSize` > 2047, it will overflow and become negative. Should have some assertion in `maxFrameSizeBytes` to warn people.
Author: zsxwing <zs...@gmail.com>
Closes #3527 from zsxwing/SPARK-4664 and squashes the following commits:
0089c7a [zsxwing] Throw an exception when spark.akka.frameSize > 2047
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1d238f22
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1d238f22
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1d238f22
Branch: refs/heads/master
Commit: 1d238f221c3e13c525b3af0c78eda95059ce9fc6
Parents: 6384f42
Author: zsxwing <zs...@gmail.com>
Authored: Mon Dec 1 00:32:54 2014 -0800
Committer: Reynold Xin <rx...@databricks.com>
Committed: Mon Dec 1 00:32:54 2014 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/util/AkkaUtils.scala | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/1d238f22/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 10010bd..8c2457f 100644
--- a/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala
+++ b/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala
@@ -134,9 +134,16 @@ private[spark] object AkkaUtils extends Logging {
Duration.create(conf.getLong("spark.akka.lookupTimeout", 30), "seconds")
}
+ private val AKKA_MAX_FRAME_SIZE_IN_MB = Int.MaxValue / 1024 / 1024
+
/** Returns the configured max frame size for Akka messages in bytes. */
def maxFrameSizeBytes(conf: SparkConf): Int = {
- conf.getInt("spark.akka.frameSize", 10) * 1024 * 1024
+ 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")
+ }
+ frameSizeInMB * 1024 * 1024
}
/** Space reserved for extra data in an Akka message besides serialized task or task result. */
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org