smart_proxy_remote_execution_ssh 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bf9a9cd391f128780ac403359755a08e43b86e8
-  data.tar.gz: be0a53b4f7b689bda67cdb2b28fa89c22e3a2878
+  metadata.gz: 91afb2738282d322802d7b56291b5240cb62b478
+  data.tar.gz: b42e795f671e0165e60fe821ca12de4c70884fd1
 SHA512:
-  metadata.gz: 8c1b58e4274b142141079415c701b502bcb68445c9d0bbe8339a69500e3e6ad517bbb11646357f1bfa04b8784a557d75cf93f162a6edb480bd47dcb3729dd0ae
-  data.tar.gz: 7be875190530ba3009b69a7a2e91caa999e4f9c14f43fa58b90423da2e59a50d8ec10d5d332f1a7795bb1561becd2331d74052f0fc88375bdc57138a298d0ed0
+  metadata.gz: 17ce48cae4e47ebb886157156f0d5e35271b184f84e07762dff735bbe32ae458a907a6956a20d1f18c686dc24802f48018eff8ec8a341071f1c65a5a6bd7f4ca
+  data.tar.gz: bb75cd72b3fbb5a28c63c7b28a6067ac02d6f568ed40bd759dcdd3102b4b4cae5af24e4631276a2220dd8b094553fc0c83697bccc6ba597114b8a351ff520e25

data/lib/smart_proxy_remote_execution_ssh/connector.rb

@@ -85,6 +85,9 @@ module Proxy::RemoteExecution::Ssh
       tries = 0
       begin
         session.process(0)
+      rescue Net::SSH::Disconnect => e
+        session.shutdown!
+        raise e
       rescue => e
         @logger.error("Error while processing ssh channel: #{e.class} #{e.message}\n #{e.backtrace.join("\n")}")
         tries += 1

data/lib/smart_proxy_remote_execution_ssh/session.rb

@@ -5,6 +5,8 @@ module Proxy::RemoteExecution::Ssh
   # Dynflow action. It runs just one (actor) thread for all the commands
   # running in the system and updates the Dynflow actions periodically.
   class Session < ::Dynflow::Actor
+    EXPECTED_POWER_ACTION_MESSAGES = ["restart host", "shutdown host"]
+
     def initialize(options = {})
       @clock = options[:clock] || Dynflow::Clock.spawn('proxy-dispatcher-clock')
       @logger = options[:logger] || Logger.new($stderr)
@@ -55,6 +57,15 @@ module Proxy::RemoteExecution::Ssh
           finish_command
         end
       end
+    rescue Net::SSH::Disconnect => e
+      check_expecting_disconnect
+      if @expecting_disconnect
+        @command_buffer << CommandUpdate::StatusData.new(0)
+      else
+        @command_buffer.concat(CommandUpdate.encode_exception("Failed to refresh the connector", e, true))
+      end
+      refresh_command_buffer
+      finish_command
     rescue => e
       @command_buffer.concat(CommandUpdate.encode_exception("Failed to refresh the connector", e, false))
     ensure
@@ -65,6 +76,7 @@ module Proxy::RemoteExecution::Ssh
     def refresh_command_buffer
       @logger.debug("command #{@command} got new output: #{@command_buffer.inspect}")
       command_update = CommandUpdate.new(@command_buffer)
+      check_expecting_disconnect
       @command.suspended_action << command_update
       @command_buffer = []
       if command_update.exit_status
@@ -186,5 +198,16 @@ module Proxy::RemoteExecution::Ssh
         @refresh_planned = true
       end
     end
+
+    # when a remote server disconnects, it's hard to tell if it was on purpose (when calling reboot)
+    # or it's an error. When it's expected, we expect the script to produce 'restart host' as
+    # its last command output
+    def check_expecting_disconnect
+      last_output = @command_buffer.reverse.find { |d| d.is_a? CommandUpdate::StdoutData }
+      return unless last_output
+      if EXPECTED_POWER_ACTION_MESSAGES.any? { |message| last_output.data =~ /^#{message}/ }
+        @expecting_disconnect = true
+      end
+    end
   end
 end

data/lib/smart_proxy_remote_execution_ssh/version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module RemoteExecution
     module Ssh
-      VERSION = '0.0.12'
+      VERSION = '0.0.13'
     end
   end
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_remote_execution_ssh
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -112,42 +112,42 @@ dependencies:
   name: smart_proxy_dynflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -184,12 +184,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []