Skip to content

[SPARK-7031][ThriftServer]let thrift server take SPARK_DAEMON_MEMORY and SPARK_DAEMON_JAVA_OPTS #5609

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
WangTaoTheTonic wants to merge 6 commits into from
Closed

[SPARK-7031][ThriftServer]let thrift server take SPARK_DAEMON_MEMORY and SPARK_DAEMON_JAVA_OPTS #5609

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4fb25ed
let thrift server take SPARK_DAEMON_MEMORY and SPARK_DAEMON_JAVA_OPTS
WangTaoTheTonic Apr 21, 2015
0565831
fix failed tests
WangTaoTheTonic Apr 21, 2015
624e652
fix break tests
WangTaoTheTonic Apr 23, 2015
d3ddfb6
revert the unnecessary changes in suite
WangTaoTheTonic Apr 25, 2015
035069b
better code style
WangTaoTheTonic Apr 30, 2015
8d3fc16
indent
WangTaoTheTonic Apr 30, 2015
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
better code style
  • Loading branch information
@WangTaoTheTonic
WangTaoTheTonic committed Apr 30, 2015
commit 035069ba4c98bcec73e0534e56eb429e6c541dd3
14 changes: 5 additions & 9 deletions launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,16 +205,12 @@ private List<String> buildSparkSubmitCommand(Map<String, String> env) throws IOE
// - SPARK_DRIVER_MEMORY env variable
// - SPARK_MEM env variable
// - default value (512m)
String memory;
// Take Thrift Server as daemon
if (isThriftServer(mainClass)) {
memory = firstNonEmpty(System.getenv("SPARK_DAEMON_MEMORY"),
firstNonEmptyValue(SparkLauncher.DRIVER_MEMORY, conf, props),
System.getenv("SPARK_DRIVER_MEMORY"), System.getenv("SPARK_MEM"), DEFAULT_MEM);
} else {
memory = firstNonEmpty(firstNonEmptyValue(SparkLauncher.DRIVER_MEMORY, conf, props),
System.getenv("SPARK_DRIVER_MEMORY"), System.getenv("SPARK_MEM"), DEFAULT_MEM);
}
String tsMemory =
isThriftServer(mainClass) ? System.getenv("SPARK_DAEMON_MEMORY") : null;
String memory = firstNonEmpty(tsMemory,
firstNonEmptyValue(SparkLauncher.DRIVER_MEMORY, conf, props),
System.getenv("SPARK_DRIVER_MEMORY"), System.getenv("SPARK_MEM"), DEFAULT_MEM);
cmd.add("-Xms" + memory);
cmd.add("-Xmx" + memory);
addOptionString(cmd, firstNonEmptyValue(SparkLauncher.DRIVER_EXTRA_JAVA_OPTIONS, conf, props));
Expand Down