bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From evan...@apache.org
Subject bigtop git commit: BIGTOP-2074. spark-worker doesn't start during deploy from master
Date Thu, 22 Oct 2015 18:37:58 GMT
Repository: bigtop
Updated Branches:
  refs/heads/master 2c2579cf5 -> 8bea68ff0


BIGTOP-2074. spark-worker doesn't start during deploy from master


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/8bea68ff
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/8bea68ff
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/8bea68ff

Branch: refs/heads/master
Commit: 8bea68ff04773e711a0e8f3a622bb48f082471a8
Parents: 2c2579c
Author: Evans Ye <evansye@apache.org>
Authored: Wed Oct 21 17:58:51 2015 +0000
Committer: Evans Ye <evansye@apache.org>
Committed: Fri Oct 23 02:37:37 2015 +0800

----------------------------------------------------------------------
 bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml        | 2 +-
 bigtop-deploy/puppet/modules/spark/templates/spark-env.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/8bea68ff/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
index e46ba1f..b152c81 100644
--- a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
+++ b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
@@ -123,7 +123,7 @@ hadoop_oozie::server::kerberos_realm: "%{hiera('kerberos::site::realm')}"
 hcatalog::server::kerberos_realm: "%{hiera('kerberos::site::realm')}"
 hcatalog::webhcat::server::kerberos_realm: "%{hiera('kerberos::site::realm')}"
 
-spark::common::spark_master_host: "%{hiera('bigtop::hadoop_head_node')}"
+spark::common::master_host: "%{hiera('bigtop::hadoop_head_node')}"
 
 tachyon::common::master_host: "%{hiera('bigtop::hadoop_head_node')}"
 

http://git-wip-us.apache.org/repos/asf/bigtop/blob/8bea68ff/bigtop-deploy/puppet/modules/spark/templates/spark-env.sh
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/spark/templates/spark-env.sh b/bigtop-deploy/puppet/modules/spark/templates/spark-env.sh
index e355034..f7845a1 100644
--- a/bigtop-deploy/puppet/modules/spark/templates/spark-env.sh
+++ b/bigtop-deploy/puppet/modules/spark/templates/spark-env.sh
@@ -66,7 +66,8 @@
 export HADOOP_HOME=${HADOOP_HOME:-/usr/lib/hadoop}
 export HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-/etc/hadoop/conf}
 
-export SPARK_MASTER_IP=<%= @master_port %>
+export STANDALONE_SPARK_MASTER_HOST=<%= @master_host %>
+export SPARK_MASTER_IP=$STANDALONE_SPARK_MASTER_HOST
 export SPARK_MASTER_WEBUI_PORT=<%= @master_ui_port %>
 export SPARK_MASTER_PORT=7077
 export SPARK_WORKER_PORT=7078


Mime
View raw message