You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by am...@apache.org on 2016/09/12 08:50:02 UTC
[1/2] incubator-beam git commit: Set master if not already set.
Repository: incubator-beam
Updated Branches:
refs/heads/master 49208cadd -> f81b9a041
Set master if not already set.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/c9610623
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/c9610623
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/c9610623
Branch: refs/heads/master
Commit: c9610623e41f2352182bb8a359244df226902079
Parents: 49208ca
Author: Sela <an...@paypal.com>
Authored: Mon Sep 12 11:00:34 2016 +0300
Committer: Sela <an...@paypal.com>
Committed: Mon Sep 12 11:00:34 2016 +0300
----------------------------------------------------------------------
.../beam/runners/spark/translation/SparkContextFactory.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c9610623/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/SparkContextFactory.java
----------------------------------------------------------------------
diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/SparkContextFactory.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/SparkContextFactory.java
index e008448..0e7db9f 100644
--- a/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/SparkContextFactory.java
+++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/SparkContextFactory.java
@@ -64,7 +64,10 @@ public final class SparkContextFactory {
private static JavaSparkContext createSparkContext(String master, String appName) {
SparkConf conf = new SparkConf();
- conf.setMaster(master);
+ if (!conf.contains("spark.master")) {
+ // set master if not set.
+ conf.setMaster(master);
+ }
conf.setAppName(appName);
conf.set("spark.serializer", KryoSerializer.class.getCanonicalName());
return new JavaSparkContext(conf);
[2/2] incubator-beam git commit: [BEAM-627] Set Spark master only if
not set.
Posted by am...@apache.org.
[BEAM-627] Set Spark master only if not set.
This closes #944
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/f81b9a04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/f81b9a04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/f81b9a04
Branch: refs/heads/master
Commit: f81b9a04106e7aed484e8016b51c96654e8eb221
Parents: 49208ca c961062
Author: Sela <an...@paypal.com>
Authored: Mon Sep 12 11:41:53 2016 +0300
Committer: Sela <an...@paypal.com>
Committed: Mon Sep 12 11:41:53 2016 +0300
----------------------------------------------------------------------
.../beam/runners/spark/translation/SparkContextFactory.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------