dtk-action-agent 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91b2a5186f6e4ccaba5687ce9ffac7b2baa1c603
-  data.tar.gz: 7b2176431344e9e2078fe2372616cff51b705627
+  metadata.gz: 5789ee64fd987ef9f0ad70e04cb6b1022bab5189
+  data.tar.gz: b67bce545ec9ea72603ddc4b1ea53a54eafe248b
 SHA512:
-  metadata.gz: a0e490c27b693136932285d1e1632270725b4a2381eef22f0e00c59cdcf281f5fcf704faad40a3ca7d021f2fdf37cdd935845c63fce90f6306fdab5049e9fedd
-  data.tar.gz: ac498ebb4fd65f5f289e61a198d8e2dcd2de13f2b7f74a1d01db6f25ba5d7c710ed9f32195b5df30363e1d6f4bacde956b70c3f9aef3d13cd4985be3f265675c
+  metadata.gz: fa34c66700cc5b7d5d385062cc7d617f068aafe8a1e64c36638415286e62d4828e9e982929a4e0323dffe28dd290d66d6228e9cc6fda8566cbb5108e12a06ef9
+  data.tar.gz: 08a7c4184e8e0c9d9184876715e4facfa9e4e5fbdaea905a2e367fa31ee4b0ddf7d0aae35349d69ef308905b3da8cab6c4d7120b896519bc4e6717c884c20c6b

data/lib/command.rb

@@ -1,11 +1,14 @@
 require 'open3'
 require 'timeout'
 
+
+
 module DTK
   module Agent
 
     ##
     # This is container for command as received from Node Agent
+    #
 
     class Command
 
@@ -20,6 +23,7 @@ module DTK
       #
 
       STDOUT_REDIRECT = ' 2>&1'
+      STREAM_TIMEOUT  = 5
 
       def initialize(value_hash)
         @command_type    = value_hash['type']
@@ -45,13 +49,15 @@ module DTK
         begin
           Commander.set_environment_variables(@env_vars)
 
-          Timeout.timeout(@timeout) do
-            Log.debug("Command started: '#{self.to_s}'")
-            @out, @err, @process_status = Open3.capture3(formulate_command)
-          end
 
-        rescue Timeout::Error
-          @error_message = "Timeout (#{@timeout} sec) for this action has been exceeded"
+          results = capture3_with_timeout(formulate_command)
+
+          @out = results[:stdout]
+          @err = results[:stderr]
+          @process_status = results[:status]
+
+          @error_message = "Timeout (#{@timeout} sec) for this action has been exceeded" if results[:timeout]
+
         rescue Exception => e
           @error_message = e.message
           @backtrace = e.backtrace
@@ -128,6 +134,83 @@ module DTK
 
     private
 
+      ##
+      # Open3 method extended with timeout, more info https://gist.github.com/pasela/9392115
+      #
+
+      def capture3_with_timeout(*cmd)
+        spawn_opts = Hash === cmd.last ? cmd.pop.dup : {}
+        opts = {
+          :stdin_data => "",
+          :timeout    => @timeout,
+          :signal     => :TERM,
+          :kill_after => nil,
+        }
+
+        in_r,  in_w  = IO.pipe
+        out_r, out_w = IO.pipe
+        err_r, err_w = IO.pipe
+        in_w.sync = true
+
+        spawn_opts[:in]  = in_r
+        spawn_opts[:out] = out_w
+        spawn_opts[:err] = err_w
+
+        result = {
+          :pid     => nil,
+          :status  => nil,
+          :stdout  => nil,
+          :stderr  => nil,
+          :timeout => false,
+        }
+
+        out_reader = nil
+        err_reader = nil
+        wait_thr = nil
+
+        begin
+          Timeout.timeout(opts[:timeout]) do
+            result[:pid] = spawn(*cmd, spawn_opts)
+            wait_thr = Process.detach(result[:pid])
+            in_r.close
+            out_w.close
+            err_w.close
+
+            out_reader = Thread.new { out_r.read }
+            err_reader = Thread.new { err_r.read }
+
+            in_w.close
+
+            result[:status] = wait_thr.value
+          end
+        rescue Timeout::Error
+          result[:timeout] = true
+          pid = result[:pid]
+          Process.kill(opts[:signal], pid)
+          if opts[:kill_after]
+            unless wait_thr.join(opts[:kill_after])
+              Process.kill(:KILL, pid)
+            end
+          end
+        ensure
+          result[:status] = wait_thr.value if wait_thr
+          begin
+            # there is a bug where there is infinite leg on out_reader (e.g. hohup) commands
+            Timeout.timeout(STREAM_TIMEOUT) do
+              result[:stdout] = out_reader.value if out_reader
+              result[:stderr] = err_reader.value if err_reader
+            end
+          rescue Timeout::Error
+            result[:stdout] ||= ''
+            result[:stderr] ||= ''
+          end
+          out_r.close unless out_r.closed?
+          err_r.close unless err_r.closed?
+        end
+
+        result
+      end
+
       #
       # Based on stdout-redirect flag
       #

data/lib/dtk-action-agent/version.rb

@@ -1,5 +1,5 @@
 module DTK
   module ActionAgent
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/lib/position.rb

@@ -96,10 +96,12 @@ module DTK
       def position_git()
         unless File.directory?(@target_path)
           begin
+            tries ||= 2
             g_repo = Git.clone("#{@git_url}", '', :path => @target_path, :branch => @branch)
             Log.info("Positioner successfully cloned git repository '#{@git_url}@#{@branch}' to location '#{@target_path}'")
           rescue Exception => e
             cleanup_path()
+            retry unless (tries -= 1).zero?
             trigger_error("Positioner unable to clone provided url #{@git_url}. Reasone: #{e.message}", 1, e.backtrace)
           end
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-action-agent
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print