petasos 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ff98d0ee0f69c09a8436007524d6650b8ed5e82c4f2ced088b0a8da72ac31cd
-  data.tar.gz: 4e16bc991db6f87baa0f056e64834251749c290b3e6aba9db66586ff6850a2fb
+  metadata.gz: aa99f3e5d9f11e0330a51234fbfa8ed194368cf471a3d70306e4751fdd716e79
+  data.tar.gz: dd22a538aab970b00ab9535c034ff07c44562b6d80fd7bf7b6abaf461bcacfb2
 SHA512:
-  metadata.gz: d0cc807729014a25f679cfadddcc8ee6851b2312438790e193ebd4b38ce9182d1a4ee4a0d0da07685eee1b125671841f1b7758b1708699d6b2328bd8ea74bab8
-  data.tar.gz: 9b44f27902559d5b0d3df48ab822186d3de4f28627b86a0f1288000e4d1e61ad7985348ea6efaf03bb94d9ba654941b48ec72a2febe6d851d5825b83753c3f46
+  metadata.gz: fba6de2e29d35efcba72bed8d2fe2afad5b63aa45aab4d1924da9e81e6ea9e6916984ecdf4b0ee3a06bc7d15a66279267a0cda77596f85955ca1092f2fb59625
+  data.tar.gz: b2f040050ae79ca54120ed1aabc94b0933ab9258a685f51129b5e5d04b09b0a6b9cdf79da88391ffd8fcd320ba5010004baf394f370c1330d80a0e3ccff45b2d

data/lib/petasos/distributor.rb

@@ -112,6 +112,7 @@ class Petasos::Distributor
 
     # Process the backfills.
     @pools.each_pair do |pool_name, manifest_hash|
+      `mkdir -p petasos_distributor_workspace`
       # for each canonical exporter loop through the backfill lists, identify files that need moving and move them
       manifest_hash["canonical_exporters"].each do |canonical_exporter_details|
         exporter_seen_files = get_seen_file_hash(canonical_exporter_details.first, canonical_exporter_details.last, pool_name)
@@ -134,15 +135,15 @@ class Petasos::Distributor
       end
     end
     # clear the seen files locally.
-    `rm seen_*`
+    `rm petasos_distributor_workspace/*`
   end
 
   def get_seen_file_hash(node_name, location_name, pool_name)
     find_node(node_name).grab_seen_file_for_location(location_name, pool_name)
     seen_file_hash = {}
     # some locations/pools do not generate a seen file.
-    if File.file?("seen_#{location_name}_#{pool_name}.yaml")
-      seen_file_list = YAML.load_file("seen_#{location_name}_#{pool_name}.yaml")
+    if File.file?("petasos_distributor_workspace/seen_#{location_name}_#{pool_name}.yaml")
+      seen_file_list = YAML.load_file("petasos_distributor_workspace/seen_#{location_name}_#{pool_name}.yaml")
     else
       seen_file_list = []
     end

data/lib/petasos/location.rb

@@ -144,12 +144,12 @@ class Petasos::Location
     end
   end
 
-  def clear_all_seen_pool_files
-    pools.each do |pool|
-      yaml_path = File.join(path, "seen_#{pool["name"]}.yaml")
-      write_yaml(yaml_path, [])
-    end
-  end
+  # def clear_all_seen_pool_files
+  #   pools.each do |pool|
+  #     yaml_path = File.join(path, "seen_#{pool["name"]}.yaml")
+  #     write_yaml(yaml_path, [])
+  #   end
+  # end
 
   def create_file_export_list(pool, file_paths)
     yaml_path = File.join(Dir.pwd, "exports_#{@config["name"]}_#{pool["name"]}_#{Time.now.strftime("%Y-%m-%d-%H:%M:%S")}.yaml")

data/lib/petasos/node.rb

@@ -39,7 +39,7 @@ class Petasos::Node
   end
 
   def grab_seen_file_for_location(location_name, pool_name)
-    `scp #{config["host"]}:#{config["path"]}/seen_#{location_name}_#{pool_name}.yaml .`
+    `scp #{config["host"]}:#{config["path"]}/seen_#{location_name}_#{pool_name}.yaml petasos_distributor_workspace/`
   end
 
   def parse_manifests

data/lib/petasos.rb

@@ -7,14 +7,30 @@ class Petasos
   class Error < StandardError; end
 
   def run(mode = "")
-    unless File.file?("petasos_is_running")
-      `touch petasos_is_running`
-      process_locations
-      unless mode == "locations"
-        process_distribution if File.file?(File.join(Dir.pwd, "petasos_distribution-config.yaml"))
+    if mode == "locations"
+      lock_and_run("locations") do
         process_locations
       end
-      `rm petasos_is_running`
+    elsif mode == "distribution"
+      lock_and_run("distribution") do
+        process_distribution
+      end
+    else # mode is neither distribution or locations
+      lock_and_run("locations") do
+        process_locations
+      end
+      lock_and_run("distribution") do
+        process_distribution
+      end
+    end
+  end
+
+  def lock_and_run(mode, &block)
+    lock_filename = "petasos_is_running_#{mode}"
+    if !File.file?(lock_filename)
+      `touch #{lock_filename}`
+      yield
+      `rm #{lock_filename}`
     end
   end
 

metadata

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