Skip to content

Snap 2084 #86

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

Merged
rishitesh merged 7 commits into from
Dec 28, 2017
Merged

Snap 2084 #86

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a6c4083
[SNAp-2084] Added a check to set Snappy UMM if found in classpath.
Nov 14, 2017
78884fb
SparkEnv modified to set SnappyUMM if in classpath.
Nov 14, 2017
fb081c5
Merge branch 'snappy/branch-2.1' into SNAP-2084
Nov 27, 2017
f7a49b1
Merge branch 'snappy/branch-2.1' into SNAP-2084
Dec 18, 2017
9de66c9
Added spark header to avoid scalastyle error.
Dec 20, 2017
b9e1247
Changed based on review comments.
Dec 23, 2017
eb7a6a4
adding full copyright header.
Dec 28, 2017
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
Prev Previous commit
Next Next commit
Changed based on review comments.
  • Loading branch information
rmishra committed Dec 23, 2017
commit b9e1247a0485d47091fbfcc2e1f2be1133700da4
12 changes: 6 additions & 6 deletions core/src/main/scala/org/apache/spark/SparkEnv.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,12 +372,12 @@ object SparkEnv extends Logging {

val useLegacyMemoryManager = conf.getBoolean("spark.memory.useLegacyMode", false)
val memoryManager: MemoryManager =
SparkSnappyUtils.loadSnappyManager(conf, numUsableCores).getOrElse {
conf.getOption("spark.memory.manager").filterNot(_.equalsIgnoreCase("default"))
.map(Utils.classForName(_)
.getConstructor(classOf[SparkConf], classOf[Int])
.newInstance(conf, Int.box(numUsableCores))
.asInstanceOf[MemoryManager]).getOrElse {
conf.getOption("spark.memory.manager").filterNot(_.equalsIgnoreCase("default"))
.map(Utils.classForName(_)
.getConstructor(classOf[SparkConf], classOf[Int])
.newInstance(conf, Int.box(numUsableCores))
.asInstanceOf[MemoryManager]).getOrElse {
SparkSnappyUtils.loadSnappyManager(conf, numUsableCores).getOrElse {
if (useLegacyMemoryManager) {
new StaticMemoryManager(conf, numUsableCores)
} else {
Expand Down