rbbt-util 5.21.25 → 5.21.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b21d6a5e58da7ef9971f899e920326df6d34c34
-  data.tar.gz: 4c18599fdabee42ff93491cff0a738058a1f0913
+  metadata.gz: e203165042b07b13e23b68e1866b666f62f4fd23
+  data.tar.gz: f5ddf081857b16e545252d75f32b44abdaec95b6
 SHA512:
-  metadata.gz: d45b7d8beede9afe141d6968d09feb4a5f49ec1c54db038dfa4d86a21e73494c46249419ce42bf6d6f6bfc6feb054bf271f7529de30313b769d40f4b7a249df6
-  data.tar.gz: 3bd0a79f7dfc9f8469a21d3ad06d4b94c19134d6b3c37bb225e22783d5c28029539c3f1eaf4e4782b69b5053694cd6a24d16bff3a5d41fef0b07719c997a0dc7
+  metadata.gz: 3033f617246ea9979a534f5d381b1a836e91396d43b1045dbbb55cb0ad4cfbd23f92313b8670f4203806a8f1a1304f2bc7cc6e37f8bea61430f75b932face679
+  data.tar.gz: aef14c07604f7db9a9b9d3901ccc455e6874911f17ffdb802b7e91654ea2e4f6ff9fcf665b3b6fcf33fa913e58bff70d56ac01974d9d03818b0a351789755fa1

data/lib/rbbt/monitor.rb

@@ -133,6 +133,7 @@ module Rbbt
     tasks = tasks.collect{|w| w.to_s} if tasks
 
     jobs = {}
+    seen = Set.new
     dirs.collect do |dir|
       next unless Open.exists? dir
 
@@ -144,12 +145,14 @@ module Rbbt
           task = File.basename(taskdir)
           next if tasks and not tasks.include? task
 
-          files = `find "#{ taskdir }/" -not -type d -not -path "*/*.files/*" 2>/dev/null`.split("\n").sort
-          _files = Set.new files
-          TSV.traverse files, :type => :array, :into => jobs do |file|
+          cmd = "find '#{ taskdir }/' -not -type d -not -path '*/*.files/*' -not -path '*/*.pid' 2>/dev/null"
+          files = CMD.cmd(cmd, :pipe => true)
+          TSV.traverse files, :type => :array, :into => jobs, :_bar => "Finding jobs in #{ taskdir }" do |file|
             if m = file.match(/(.*).(info|pid)$/)
               file = m[1]
             end
+            next if seen.include? file
+            seen << file
 
             name = file[taskdir.length+1..-1]
             info_file = file + '.info'

data/share/rbbt_commands/system/clean

@@ -14,7 +14,8 @@ Clean orphaned files
 $ rbbt system clean <workflow> <task>
 
 -a--all Apply to all jobs, not only uncompleted
--f--force Remove regardless of been active
+-f--force Remove locks and files regardless of been active
+-q--quick Quick check
 -h--help Print this help
 EOF
 rbbt_usage and exit 0 if options[:help]
@@ -75,24 +76,29 @@ puts
 jobs = Rbbt.job_info workflow, task
 workflows = {}
 
-jobs.each do |file,i|
-  info = begin
-           Open.open(i[:info_file]) do |f|
-             Marshal.load(f)
+TSV.traverse jobs, :bar => "Checking job status" do |file,i|
+  if options[:quick] and File.exists? file
+    status = 'done'
+  else
+    info = begin
+             Open.open(i[:info_file]) do |f|
+               Step::INFO_SERIALIAZER.load(f)
+             end
+           rescue
+             {:status => :noinfo}
            end
-         rescue
-           {:status => :noinfo}
-         end
 
-  pid = info[:pid]
+    pid = info[:pid]
 
-  status = info[:status].to_s
-  status = :missing if status == "done" and not File.exist? file
-  status = :nopid if status != "done" and pid.nil?
-  status = :dead if status != "done" and pid and not Misc.pid_exists?(pid)
-  status = :sync if status != "done" and File.exist? file
+    status = info[:status].to_s
+    status = :missing if status == "done" and not File.exist? file
+    status = :nopid if status != "done" and pid.nil?
+    status = :dead if status != "done" and pid and not Misc.pid_exists?(pid)
+    status = :sync if status != "done" and File.exist? file
+
+    status = status.to_s
+  end
 
-  status = status.to_s
   next unless status =~ /\bnopid/ or status =~ /\berror$/ or status =~ /\bmissing$/ or status =~ /\baborted$/ or status =~ /\bdead$/ or status =~ /\bsync$/ or status == "" or (force and status == 'noinfo')
   puts "  Removing #{ file } - #{status}" 
   Step.clean(file) 

data/share/rbbt_commands/system/status

@@ -15,6 +15,7 @@ $ rbbt system status <workflow> <task>
 
 -a--all Print all jobs, not only uncompleted
 -h--help Print this help
+-q--quick Quick check
 EOF
 rbbt_usage and exit 0 if options[:help]
 
@@ -115,7 +116,7 @@ puts Log.color(:magenta, "# Workflows")
 jobs = Rbbt.job_info workflow, task
 workflows = {}
 
-jobs.each do |file,info|
+TSV.traverse jobs, :_bar => "Checking job status" do |file,info|
   next unless all or not info[:done] or not File.exist? file
   workflow = info[:workflow]
   task = info[:task]
@@ -129,23 +130,27 @@ workflows.sort.each do |workflow,tasks|
     puts "* " << Log.color(:magenta, workflow) << "#" << Log.color(:yellow, task) << ": " <<  Log.color(:blue, jobs.length.to_s)
 
     files_txt = jobs.collect do |file, i|
-      info = begin
-               Open.open(i[:info_file]) do |f|
-                 Marshal.load(f)
+      if options[:quick] and File.exists? file
+        status = 'done'
+      else
+        info = begin
+                 Open.open(i[:info_file]) do |f|
+                   Step::INFO_SERIALIAZER.load(f)
+                 end
+               rescue
+                 {:status => :noinfo}
                end
-             rescue
-               {:status => :noinfo}
-             end
-
-      pid = info[:pid]
-      status = info[:status]
-      status = :missing if status == :done and not File.exist? file
-      status = status.to_s
-      if status != "done" and pid and not Misc.pid_exists?(pid)
-        if File.exist? file
-          status << Log.color(:red, " (out of sync)") 
-        else
-          status << Log.color(:red, " (dead)") 
+
+        pid = info[:pid]
+        status = info[:status]
+        status = :missing if status == :done and not File.exist? file
+        status = status.to_s
+        if status != "done" and pid and not Misc.pid_exists?(pid)
+          if File.exist? file
+            status << Log.color(:red, " (out of sync)") 
+          else
+            status << Log.color(:red, " (dead)") 
+          end
         end
       end
       str = file.dup
@@ -153,7 +158,9 @@ workflows.sort.each do |workflow,tasks|
       str << "; #{pid_msg pid}" unless status == "done"
       str
     end
+
     files_txt.each do |f|
+      next if f.nil?
       puts "  " << f
     end
   end

data/share/rbbt_commands/workflow/task

@@ -447,7 +447,7 @@ when (defined?(WorkflowRESTClient) and WorkflowRESTClient::RemoteStep)
     res.join if res.respond_to? :join
   elsif res.nil?
     job.join
-    puts Open.read(job.path)
+    puts Open.read(job.path, :nocache => true)
   else
     puts res.to_s
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.21.25
+  version: 5.21.26
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-11 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake