rbbt-util 5.25.1 → 5.25.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90520a5d90fb50559c81af63d6dc6160a5c0b3b7
-  data.tar.gz: 3bd6c4c62ae7005de91c309e9ca25a97e4dd5225
+  metadata.gz: 54fa4586d586432080dada81ffa2e9bb5855c947
+  data.tar.gz: 45cec7e1aa0666389e5af932de660220db04154b
 SHA512:
-  metadata.gz: 9596ac571a80a8519a0a0e1fe333a74fc500705ff962591253d5f22ca6b17e38040f06d0351f8c923b8f6ba35853d1e0fea808b392f60712b6384388e4b1d2f7
-  data.tar.gz: 135ced6644d8628df1f58de6be2a310367ed90897e4bd3628e9177f86b7aff1701ef2aec99b8516b8f27ba4e7fbb01b6a54aaca375434189d8d9395447a6152e
+  metadata.gz: 41a13012b722603f8ed7e077afe973b57e92f7d42f65cc5d276b5fdf5622fa556e578de1263641fddbae02ae5f1f8ac8c046712a33d68a11e14f33098a35e25a
+  data.tar.gz: dced005598f84d98de39887d9c3f1cb89eaff0b29d872c01abb23605f998ca0ecad2d444526ee49c68fe7d633d575609634c245b68e9d89e95e33b59405cdb97

data/lib/rbbt/rest/client/step.rb

@@ -158,7 +158,7 @@ class WorkflowRESTClient
 
     def done?
       init_job unless @url
-      @done || status.to_s == 'done'
+      @done || status.to_s == 'done' || status.to_s == 'noinfo'
     end
 
     def files

data/lib/rbbt/workflow/step/dependencies.rb

@@ -136,7 +136,7 @@ class Step
       end
 
       dependency.status_lock.synchronize do
-        if dependency.aborted? || (dependency.error? && dependency.recoverable_error? && ! canfail_paths.include?(dependency.path) && ! already_failed << dependency.path) || (!Open.remote?(dependency.path) && dependency.missing?)
+        if dependency.aborted? || (dependency.error? && dependency.recoverable_error? && ! canfail_paths.include?(dependency.path) && ! already_failed.include?(dependency.path)) || (!Open.remote?(dependency.path) && dependency.missing?)
           Log.warn "Cleaning dep. on exec #{Log.color :blue, dependency.path} (missing: #{dependency.missing?}; error #{dependency.error?})"
           dependency.clean
           already_failed << dependency.path

data/lib/rbbt/workflow/step/run.rb

@@ -476,16 +476,21 @@ class Step
     raise "Can not fork: Step is waiting for proces #{@pid} to finish" if not @pid.nil? and not Process.pid == @pid and Misc.pid_exists?(@pid) and not done? and info[:forked]
     sout, sin = Misc.pipe if no_load == :stream
     @pid = Process.fork do
+      Signal.trap(:TERM) do
+        raise Aborted, "Recieved TERM Signal on forked process #{Process.pid}"
+      end
       sout.close if sout
       Misc.pre_fork
+      Open.mkdir File.dirname(path) unless Open.exist?(File.dirname(path))
+      Open.write(pid_file, Process.pid.to_s) unless Open.exists?(path) or Open.exists?(pid_file)
+
+      if semaphore
+        init_info
+        log :queue, "Queued over semaphore: #{semaphore}"
+        ret = RbbtSemaphore.wait_semaphore(semaphore)
+        raise SemaphoreInterrupted if ret == -1
+      end
       begin
-        Open.mkdir File.dirname(path) unless Open.exist?(File.dirname(path))
-        Open.write(pid_file, Process.pid.to_s) unless Open.exists?(path) or Open.exists?(pid_file)
-        if semaphore
-          init_info
-          log :queue, "Queued over semaphore: #{semaphore}"
-          RbbtSemaphore.wait_semaphore(semaphore) 
-        end
         begin
           @forked = true
           res = run no_load
@@ -547,7 +552,7 @@ class Step
   end
 
   def abort_pid
-    @pid ||= info[:pid]
+    @pid ||= info[:pid] || Open.read(pid_file)
 
     case @pid
     when nil
@@ -557,14 +562,14 @@ class Step
       Log.medium "Could not abort #{path}: same process"
       false
     else
-      Log.medium "Aborting pid #{path}: #{ @pid }"
+      Log.medium "Aborting pid #{path}: #{ @pid } #{Process.pid}"
       begin
-        Process.kill("INT", @pid)
-        Process.waitpid @pid
+        Process.kill("TERM", @pid.to_i)
+        s = Process.waitpid2 @pid.to_i
+        Log.medium "Aborted pid #{path}: #{ @pid } #{s.exitstatus}"
       rescue Exception
         Log.debug("Aborted job #{@pid} was not killed: #{$!.message}")
       end
-      Log.medium "Aborted pid #{path}: #{ @pid }"
       true
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.25.1
+  version: 5.25.3
 platform: ruby
 authors:
 - Miguel Vazquez