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 <[email protected]> Authored: Mon Sep 12 11:00:34 2016 +0300 Committer: Sela <[email protected]> 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);
