From 828198d467b83ee3efec71225c72e5915c8bb19c Mon Sep 17 00:00:00 2001 From: Peter Ableda Date: Thu, 14 Apr 2016 14:53:09 +0200 Subject: [PATCH] =?UTF-8?q?Round=20memory=20bytes=20and=20convert=20it=20t?= =?UTF-8?q?o=20Long=20to=20it=E2=80=99s=20original=20type.=20This=20change?= =?UTF-8?q?=20fixes=20the=20formatting=20issue=20in=20the=20Exception=20me?= =?UTF-8?q?ssage.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scala/org/apache/spark/memory/UnifiedMemoryManager.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/memory/UnifiedMemoryManager.scala b/core/src/main/scala/org/apache/spark/memory/UnifiedMemoryManager.scala index fa9c021f7037..82023b533d66 100644 --- a/core/src/main/scala/org/apache/spark/memory/UnifiedMemoryManager.scala +++ b/core/src/main/scala/org/apache/spark/memory/UnifiedMemoryManager.scala @@ -206,7 +206,7 @@ object UnifiedMemoryManager { val systemMemory = conf.getLong("spark.testing.memory", Runtime.getRuntime.maxMemory) val reservedMemory = conf.getLong("spark.testing.reservedMemory", if (conf.contains("spark.testing")) 0 else RESERVED_SYSTEM_MEMORY_BYTES) - val minSystemMemory = reservedMemory * 1.5 + val minSystemMemory = (reservedMemory * 1.5).ceil.toLong if (systemMemory < minSystemMemory) { throw new IllegalArgumentException(s"System memory $systemMemory must " + s"be at least $minSystemMemory. Please increase heap size using the --driver-memory " +