petasos 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d54a5b700fe0b66ec0d9dfd97bf5e27b2d37818af231761b81e40105ae4b4c4a
-  data.tar.gz: 34e1d0416daa3011955f99f323ac6a0538e48f44aae091507e1c058daf29c9d5
+  metadata.gz: 810926eec6ad07254828502c562bc6925bf7c2e5c1300e8e118544ea3a7497bd
+  data.tar.gz: ffc68e0b3502ef2b4961082ef348ac120f7cb0649c899be8580525c648276333
 SHA512:
-  metadata.gz: ae3cbe118ea54dd02fb2d0dfa9609b023cc7ba111f8aaab4bf4fd82f315b70d4219aff9e1219631546e9b8db403c0dc6abcc0dc4657057c45f5ef06696ceafc2
-  data.tar.gz: 3b15a8baa046e3281e2fe43b96775a7f2b4956ed3211c6163767b2e5d4366866889137bdaa970c81de6ca31a27c5a8b7e25b28e347c9f6ba1343c8b06f7fa196
+  metadata.gz: 5d02606c642cb0a8d81531f24ff9dfdab7934d9ead488af5ee08781d7fcd13618d35b2ba9eb0beaf61f00dc6fe135f0a481b12b67b9043e8621482adfb0c525c
+  data.tar.gz: fc9ee6cf4accfb9e530a483a1f70206fd8508d5c862331e15f6ef26d114fe7a891987bf93ae1f6aeb4923718bd4b1ba924418a956028d2255e33ed606455e3b5

data/lib/petasos/distributor.rb

@@ -87,8 +87,7 @@ class Petasos::Distributor
             `scp #{from_node.host}:#{export_path}* #{to_node.host}:#{pool_storage.last}`
           end
         end
-        puts "Running `petasos locations` on #{to_node.name} after export from #{from_node.name}"
-        `ssh #{to_node.host} \'cd #{to_node.path} && bash -lc \"petasos locations\"\'`
+        to_node.run_petasos_locations("after export from #{from_node.name}")
       end
       # mark it as completed
       completed_export_file_path = File.join(Dir.pwd, "completed-#{File.basename(exports_file_path)}")
@@ -96,8 +95,7 @@ class Petasos::Distributor
       # and then put it back where it came from
       `scp #{completed_export_file_path} #{from_node.host}:#{from_node.path}`
       `rm #{completed_export_file_path}`
-      puts "Running `petasos locations` on #{from_node.name} after completing its exports"
-      `ssh #{from_node.host} \'cd #{from_node.path} && bash -lc \"petasos locations\"\'`
+      from_node.run_petasos_locations("after completing its exports")
     end
 
     # {"wow-ah"=>
@@ -129,8 +127,7 @@ class Petasos::Distributor
             end
           end
 
-          puts "Running `petasos locations` on #{to_node.name} after backfill from #{from_node.name}"
-          `ssh #{to_node.host} \'cd #{to_node.path} && bash -lc \"petasos locations\"\'`
+          to_node.run_petasos_locations("after backfill from #{from_node.name}")
         end
       end
     end

data/lib/petasos/node.rb

@@ -11,8 +11,7 @@ class Petasos::Node
     @manifests = []
     `mkdir -p #{config["name"]}`
 
-    puts "Running `petasos locations` on #{name} before distribution begins"
-    `ssh #{host} \'cd #{path} && bash -lc \"petasos locations\"\'`
+    run_petasos_locations("before distribution begins")
 
     grab_manifest_and_exports
     parse_manifests
@@ -30,6 +29,15 @@ class Petasos::Node
     config["path"]
   end
 
+  def petasos_locations_command
+    config["petasos_command"] || config["petasos_locations_command"] || "\'cd #{path} && bash -lc \"petasos locations\"\'"
+  end
+
+  def run_petasos_locations(context = "")
+    puts "Running `petasos locations` on #{name} #{context}"
+    `ssh #{host} #{petasos_locations_command}`
+  end
+
   def grab_manifest_and_exports
     `scp #{config["host"]}:#{config["path"]}/manifest* #{config["name"]}/`
     `scp #{config["host"]}:#{config["path"]}/exports* #{config["name"]}/`

data/lib/petasos.rb

@@ -28,9 +28,18 @@ class Petasos
   def lock_and_run(mode, &block)
     lock_filename = "petasos_is_running_#{mode}"
     if !File.file?(lock_filename)
+      puts "did not find lock file #{lock_filename}"
       `touch #{lock_filename}`
-      yield
+      begin
+        yield
+      rescue StandardError => e
+        puts "petasos: error: #{e.message}"
+        puts e.backtrace
+      end
       `rm #{lock_filename}`
+    else
+      puts "found lock file #{lock_filename}"
+      puts "petasos is already running in #{mode} mode"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: petasos
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - Justin Myers