Skip to content

[SPARK-23508][CORE] Fix BlockmanagerId in case blockManagerIdCache cause oom #20667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
caneGuy wants to merge 11 commits into from
Closed

[SPARK-23508][CORE] Fix BlockmanagerId in case blockManagerIdCache cause oom #20667

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fc1b6a0
Use timeStampedHashMap for BlockmanagerId in case blockManagerIdCache…
caneGuy Feb 24, 2018
59f34e1
Revert "Use timeStampedHashMap for BlockmanagerId in case blockManage…
caneGuy Feb 26, 2018
e5e3eff
Use softreference instead
caneGuy Feb 26, 2018
c741b58
Remove unused import
caneGuy Feb 26, 2018
36d66e1
Revert "Remove unused import"
caneGuy Feb 26, 2018
e5b793d
Revert "Use softreference instead"
caneGuy Feb 26, 2018
8f3cd47
Use guava cache instead
caneGuy Feb 26, 2018
dc522fc
Update
caneGuy Feb 27, 2018
b28985b
Refine comment
caneGuy Feb 27, 2018
3379899
Update documentation
caneGuy Feb 28, 2018
bf79f4d
Refine comment
caneGuy Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions core/src/main/scala/org/apache/spark/storage/BlockManagerId.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
package org.apache.spark.storage

import java.io.{Externalizable, IOException, ObjectInput, ObjectOutput}
import java.util.concurrent.ConcurrentHashMap

import com.google.common.cache.{CacheBuilder, CacheLoader}

import org.apache.spark.SparkContext
import org.apache.spark.annotation.DeveloperApi
Expand Down Expand Up @@ -132,10 +133,17 @@ private[spark] object BlockManagerId {
getCachedBlockManagerId(obj)
}

val blockManagerIdCache = new ConcurrentHashMap[BlockManagerId, BlockManagerId]()
/**
* The max cache size is hardcoded to 10000, since the size of a BlockManagerId
* object is about 48B, the total memory cost should be below 1MB which is feasible.
*/
val blockManagerIdCache = CacheBuilder.newBuilder()
.maximumSize(10000)
.build(new CacheLoader[BlockManagerId, BlockManagerId]() {
override def load(id: BlockManagerId) = id
})

def getCachedBlockManagerId(id: BlockManagerId): BlockManagerId = {
blockManagerIdCache.putIfAbsent(id, id)
blockManagerIdCache.get(id)
}
}