Skip to content

Commit

Permalink
Do not expose unroll memory check period
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewor14 committed Jul 24, 2014
1 parent 69bc0a5 commit a49ba4d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@ private[spark] class MemoryStore(blockManager: BlockManager, maxMemory: Long)
var keepUnrolling = true
// Initial per-thread memory to request for unrolling blocks (bytes). Exposed for testing.
val initialMemoryThreshold = conf.getLong("spark.storage.unrollMemoryThreshold", 1024 * 1024)
// How often to check whether we need to request more memory. Exposed for testing.
val memoryCheckPeriod = conf.getLong("spark.storage.unrollCheckPeriod", 16)
// How often to check whether we need to request more memory
val memoryCheckPeriod = 16
// Memory currently reserved by this thread (bytes)
var memoryThreshold = initialMemoryThreshold
// Memory to request as a multiple of current vector size
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ class BlockManagerSuite extends FunSuite with Matchers with BeforeAndAfter
conf.set("spark.driver.port", boundPort.toString)
conf.set("spark.storage.unrollFraction", "0.4")
conf.set("spark.storage.unrollMemoryThreshold", "512")
conf.set("spark.storage.unrollCheckPeriod", "1")
SparkEnv.set(env)

master = new BlockManagerMaster(
Expand Down

0 comments on commit a49ba4d

Please sign in to comment.