aboutsummaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorHong Shen <hongshen@tencent.com>2014-11-14 13:29:41 -0800
committerAndrew Or <andrew@databricks.com>2014-11-14 13:29:41 -0800
commit0c56a039a9c5b871422f0fc55ff4394bc077fb34 (patch)
treee874e090ba5abfb0c0f778f6bcd266df65d93954 /core/src
parentabd581752f9314791a688690c07ad1bb68cc09fe (diff)
downloadspark-0c56a039a9c5b871422f0fc55ff4394bc077fb34.tar.gz
spark-0c56a039a9c5b871422f0fc55ff4394bc077fb34.tar.bz2
spark-0c56a039a9c5b871422f0fc55ff4394bc077fb34.zip
[Spark Core] SPARK-4380 Edit spilling log from MB to B
https://issues.apache.org/jira/browse/SPARK-4380 Author: Hong Shen <hongshen@tencent.com> Closes #3243 from shenh062326/spark_change and squashes the following commits: 4653378 [Hong Shen] Edit spilling log from MB to B 21ee960 [Hong Shen] Edit spilling log from MB to B e9145e8 [Hong Shen] Edit spilling log from MB to B da761c2 [Hong Shen] Edit spilling log from MB to B 946351c [Hong Shen] Edit spilling log from MB to B
Diffstat (limited to 'core/src')
-rw-r--r--core/src/main/scala/org/apache/spark/util/collection/Spillable.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/src/main/scala/org/apache/spark/util/collection/Spillable.scala b/core/src/main/scala/org/apache/spark/util/collection/Spillable.scala
index d7dccd4af8..0e4c6d633a 100644
--- a/core/src/main/scala/org/apache/spark/util/collection/Spillable.scala
+++ b/core/src/main/scala/org/apache/spark/util/collection/Spillable.scala
@@ -105,7 +105,8 @@ private[spark] trait Spillable[C] {
*/
@inline private def logSpillage(size: Long) {
val threadId = Thread.currentThread().getId
- logInfo("Thread %d spilling in-memory map of %d MB to disk (%d time%s so far)"
- .format(threadId, size / (1024 * 1024), _spillCount, if (_spillCount > 1) "s" else ""))
+ logInfo("Thread %d spilling in-memory map of %s to disk (%d time%s so far)"
+ .format(threadId, org.apache.spark.util.Utils.bytesToString(size),
+ _spillCount, if (_spillCount > 1) "s" else ""))
}
}