Skip to content

Commit

Permalink
Merge pull request apache#48 from Shopify/support_ha_nn
Browse files Browse the repository at this point in the history
Added support for HA namenode
  • Loading branch information
angelini committed Feb 4, 2015
2 parents fae6581 + dfa8c42 commit c6ac972
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions Capfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set :user, "deploy"
set :shared_work_path, "/u/apps/spark/shared/work"
set :shared_logs_path, "/u/apps/spark/shared/log"
set :shared_conf_path, "/u/apps/spark/shared/conf"
set :spark_jar_path, "hdfs://nn01.chi.shopify.com/user/sparkles"
set :spark_jar_path, "hdfs://hadoop-production/user/sparkles"
set :gateway, nil
set :keep_releases, 5

Expand Down Expand Up @@ -41,11 +41,11 @@ namespace :deploy do
end

task :upload_to_hdfs, :roles => :uploader, :on_no_matching_servers => :continue do
run "hdfs dfs -copyFromLocal -f /u/apps/spark/current/lib/spark-assembly-*.jar hdfs://nn01.chi.shopify.com/user/sparkles/spark-assembly-#{fetch(:sha)}.jar"
run "hdfs dfs -copyFromLocal -f /u/apps/spark/current/lib/spark-assembly-*.jar hdfs://hadoop-production/user/sparkles/spark-assembly-#{fetch(:sha)}.jar"
end

task :test_spark_jar, :roles => :uploader, :on_no_master_servers => :continue do
run "sudo -u azkaban sh -c '. /u/virtualenvs/starscream/bin/activate && cd /u/apps/starscream/current && PYTHON_ENV=production SPARK_OPTS=\"spark.yarn.jar=hdfs://nn01.chi.shopify.com:8020/user/sparkles/spark-assembly-#{fetch(:sha)}.jar\" exec python shopify/tools/canary.py'"
run "sudo -u azkaban sh -c '. /u/virtualenvs/starscream/bin/activate && cd /u/apps/starscream/current && PYTHON_ENV=production SPARK_OPTS=\"spark.yarn.jar=hdfs://hadoop-production/user/sparkles/spark-assembly-#{fetch(:sha)}.jar\" exec python shopify/tools/canary.py'"
end

task :prevent_gateway do
Expand All @@ -60,7 +60,7 @@ namespace :deploy do

task :remind_us_to_update_starscream do
puts "****************************************************************"
puts "*"
puts "*"
puts "* Remember to update starscream/conf/config.yml"
puts "*"
puts "* spark_production"
Expand All @@ -70,7 +70,7 @@ namespace :deploy do
puts "*"
puts "****************************************************************"
end


task :restart do
end
Expand Down
2 changes: 1 addition & 1 deletion conf/spark-defaults.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

spark.cores.max 150
spark.ui.port 0
spark.yarn.jar hdfs://nn01.chi.shopify.com:8020/user/sparkles/spark-assembly-latest.jar
spark.yarn.jar hdfs://hadoop-production/user/sparkles/spark-assembly-latest.jar

0 comments on commit c6ac972

Please sign in to comment.