Merge pull request #73 from iNecas/empty-result-handling

Fixes #12437, refs #12288 - better handling of unexpected states

app/lib/actions/remote_execution/helpers/live_output.rb

@@ -0,0 +1,17 @@
+module Actions
+  module RemoteExecution
+    module Helpers
+      module LiveOutput
+        def exception_to_output(context, exception, timestamp = Time.now)
+          format_output(context + ": #{exception.class} - #{exception.message}", 'debug', timestamp)
+        end
+
+        def format_output(message, type = 'debug', timestamp = Time.now)
+          { 'output_type' => type,
+            'output' => message,
+            'timestamp' => timestamp.to_f }
+        end
+      end
+    end
+  end
+end

app/lib/actions/remote_execution/run_host_job.rb

@@ -2,6 +2,8 @@ module Actions
   module RemoteExecution
     class RunHostJob < Actions::EntryAction
 
+      include Actions::RemoteExecution::Helpers::LiveOutput
+
       def resource_locks
         :link
       end
@@ -42,7 +44,12 @@ def humanized_output
       end
 
       def live_output
-        planned_actions(RunProxyCommand).first.live_output
+        proxy_command_action = planned_actions(RunProxyCommand).first
+        if proxy_command_action
+          proxy_command_action.live_output
+        else
+          execution_plan.errors.map { |e| exception_to_output(_('Failed to initialize command'), e) }
+        end
       end
 
       def humanized_name

app/lib/actions/remote_execution/run_proxy_command.rb

@@ -3,6 +3,7 @@ module RemoteExecution
     class RunProxyCommand < Actions::ProxyAction
 
       include ::Dynflow::Action::Cancellable
+      include Actions::RemoteExecution::Helpers::LiveOutput
 
       def plan(proxy, hostname, script, options = {})
         options = { :effective_user => nil }.merge(options)
@@ -67,8 +68,9 @@ def current_proxy_output
 
       def finalized_output
         records = []
-        if self.output[:proxy_output].present?
-          records.concat(self.output[:proxy_output].fetch(:result, []))
+
+        if proxy_result.present?
+          records.concat(proxy_result)
         else
           records << format_output(_('No output'))
         end
@@ -81,14 +83,8 @@ def finalized_output
         return records
       end
 
-      def exception_to_output(context, exception, timestamp = Time.now)
-        format_output(context + ": #{exception.class} - #{exception.message}", 'debug', timestamp)
-      end
-
-      def format_output(message, type = 'debug', timestamp = Time.now)
-        { 'output_type' => type,
-          'output' => message,
-          'timestamp' => timestamp.to_f }
+      def proxy_result
+        self.output.fetch(:proxy_output, {}).fetch(:result, []) || []
       end
     end
   end