Repository: bigtop Updated Branches: refs/heads/master 11dda6079 -> 42a0f7c97
BIGTOP-1828. Puppet: Tachyon does not formatted before tachyon daemons are started up Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/42a0f7c9 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/42a0f7c9 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/42a0f7c9 Branch: refs/heads/master Commit: 42a0f7c974045c884f647063cbdad7c87aac968a Parents: 11dda60 Author: Evans Ye <[email protected]> Authored: Mon Apr 13 16:10:20 2015 +0000 Committer: Evans Ye <[email protected]> Committed: Thu Apr 30 06:35:25 2015 +0000 ---------------------------------------------------------------------- bigtop-deploy/puppet/modules/tachyon/manifests/init.pp | 6 +++--- bigtop-deploy/puppet/modules/tachyon/templates/tachyon-env.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/42a0f7c9/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp b/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp index e9715ae..557b05e 100644 --- a/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/tachyon/manifests/init.pp @@ -35,13 +35,13 @@ class tachyon { exec { "tachyon formatting": command => "/usr/lib/tachyon/bin/tachyon format", - require => [ Package["tachyon"]] + require => [ Package["tachyon"], File["/etc/tachyon/conf/log4j.properties"], File["/etc/tachyon/conf/tachyon-env.sh"] ] } if ( $fqdn == $tachyon::common::master_host ) { service { "tachyon-master": ensure => running, - require => [ Package["tachyon"] ], + require => [ Package["tachyon"], Exec["tachyon formatting"] ], hasrestart => true, hasstatus => true, } @@ -60,7 +60,7 @@ class tachyon { service { "tachyon-worker": ensure => running, - require => [Package["tachyon"]], + require => [ Package["tachyon"], File["/etc/tachyon/conf/log4j.properties"], File["/etc/tachyon/conf/tachyon-env.sh"] ], hasrestart => true, hasstatus => true, } http://git-wip-us.apache.org/repos/asf/bigtop/blob/42a0f7c9/bigtop-deploy/puppet/modules/tachyon/templates/tachyon-env.sh ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/tachyon/templates/tachyon-env.sh b/bigtop-deploy/puppet/modules/tachyon/templates/tachyon-env.sh index 1094976..9e7dbc2 100755 --- a/bigtop-deploy/puppet/modules/tachyon/templates/tachyon-env.sh +++ b/bigtop-deploy/puppet/modules/tachyon/templates/tachyon-env.sh @@ -31,7 +31,7 @@ export JAVA="$JAVA_HOME/bin/java" echo "Starting tachyon w/ java = $JAVA " -export TACHYON_MASTER_ADDRESS=<%= @tachyon_master_address %> +export TACHYON_MASTER_ADDRESS=<%= @master_host %> export TACHYON_UNDERFS_ADDRESS=$TACHYON_HOME/underfs #export TACHYON_UNDERFS_ADDRESS=hdfs://localhost:9000 export TACHYON_WORKER_MEMORY_SIZE=1GB
