smart_proxy_remote_execution_ssh 0.0.12 → 0.0.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/smart_proxy_remote_execution_ssh/connector.rb +3 -0
  3. data/lib/smart_proxy_remote_execution_ssh/session.rb +23 -0
  4. data/lib/smart_proxy_remote_execution_ssh/version.rb +1 -1
  5. metadata +22 -22
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0bf9a9cd391f128780ac403359755a08e43b86e8
4
- data.tar.gz: be0a53b4f7b689bda67cdb2b28fa89c22e3a2878
3
+ metadata.gz: 91afb2738282d322802d7b56291b5240cb62b478
4
+ data.tar.gz: b42e795f671e0165e60fe821ca12de4c70884fd1
5
5
  SHA512:
6
- metadata.gz: 8c1b58e4274b142141079415c701b502bcb68445c9d0bbe8339a69500e3e6ad517bbb11646357f1bfa04b8784a557d75cf93f162a6edb480bd47dcb3729dd0ae
7
- data.tar.gz: 7be875190530ba3009b69a7a2e91caa999e4f9c14f43fa58b90423da2e59a50d8ec10d5d332f1a7795bb1561becd2331d74052f0fc88375bdc57138a298d0ed0
6
+ metadata.gz: 17ce48cae4e47ebb886157156f0d5e35271b184f84e07762dff735bbe32ae458a907a6956a20d1f18c686dc24802f48018eff8ec8a341071f1c65a5a6bd7f4ca
7
+ data.tar.gz: bb75cd72b3fbb5a28c63c7b28a6067ac02d6f568ed40bd759dcdd3102b4b4cae5af24e4631276a2220dd8b094553fc0c83697bccc6ba597114b8a351ff520e25
data/lib/smart_proxy_remote_execution_ssh/connector.rb CHANGED
@@ -85,6 +85,9 @@ module Proxy::RemoteExecution::Ssh
85
85
  tries = 0
86
86
  begin
87
87
  session.process(0)
88
+ rescue Net::SSH::Disconnect => e
89
+ session.shutdown!
90
+ raise e
88
91
  rescue => e
89
92
  @logger.error("Error while processing ssh channel: #{e.class} #{e.message}\n #{e.backtrace.join("\n")}")
90
93
  tries += 1
data/lib/smart_proxy_remote_execution_ssh/session.rb CHANGED
@@ -5,6 +5,8 @@ module Proxy::RemoteExecution::Ssh
5
5
  # Dynflow action. It runs just one (actor) thread for all the commands
6
6
  # running in the system and updates the Dynflow actions periodically.
7
7
  class Session < ::Dynflow::Actor
8
+ EXPECTED_POWER_ACTION_MESSAGES = ["restart host", "shutdown host"]
9
+
8
10
  def initialize(options = {})
9
11
  @clock = options[:clock] || Dynflow::Clock.spawn('proxy-dispatcher-clock')
10
12
  @logger = options[:logger] || Logger.new($stderr)
@@ -55,6 +57,15 @@ module Proxy::RemoteExecution::Ssh
55
57
  finish_command
56
58
  end
57
59
  end
60
+ rescue Net::SSH::Disconnect => e
61
+ check_expecting_disconnect
62
+ if @expecting_disconnect
63
+ @command_buffer << CommandUpdate::StatusData.new(0)
64
+ else
65
+ @command_buffer.concat(CommandUpdate.encode_exception("Failed to refresh the connector", e, true))
66
+ end
67
+ refresh_command_buffer
68
+ finish_command
58
69
  rescue => e
59
70
  @command_buffer.concat(CommandUpdate.encode_exception("Failed to refresh the connector", e, false))
60
71
  ensure
@@ -65,6 +76,7 @@ module Proxy::RemoteExecution::Ssh
65
76
  def refresh_command_buffer
66
77
  @logger.debug("command #{@command} got new output: #{@command_buffer.inspect}")
67
78
  command_update = CommandUpdate.new(@command_buffer)
79
+ check_expecting_disconnect
68
80
  @command.suspended_action << command_update
69
81
  @command_buffer = []
70
82
  if command_update.exit_status
@@ -186,5 +198,16 @@ module Proxy::RemoteExecution::Ssh
186
198
  @refresh_planned = true
187
199
  end
188
200
  end
201
+
202
+ # when a remote server disconnects, it's hard to tell if it was on purpose (when calling reboot)
203
+ # or it's an error. When it's expected, we expect the script to produce 'restart host' as
204
+ # its last command output
205
+ def check_expecting_disconnect
206
+ last_output = @command_buffer.reverse.find { |d| d.is_a? CommandUpdate::StdoutData }
207
+ return unless last_output
208
+ if EXPECTED_POWER_ACTION_MESSAGES.any? { |message| last_output.data =~ /^#{message}/ }
209
+ @expecting_disconnect = true
210
+ end
211
+ end
189
212
  end
190
213
  end
data/lib/smart_proxy_remote_execution_ssh/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Proxy
2
2
  module RemoteExecution
3
3
  module Ssh
4
- VERSION = '0.0.12'
4
+ VERSION = '0.0.13'
5
5
  end
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,97 +1,97 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: smart_proxy_remote_execution_ssh
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.12
4
+ version: 0.0.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ivan Nečas
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-01-21 00:00:00.000000000 Z
11
+ date: 2016-02-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ~>
18
18
  - !ruby/object:Gem::Version
19
19
  version: '1.7'
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ~>
25
25
  - !ruby/object:Gem::Version
26
26
  version: '1.7'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ~>
32
32
  - !ruby/object:Gem::Version
33
33
  version: '10.0'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ~>
39
39
  - !ruby/object:Gem::Version
40
40
  version: '10.0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: minitest
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - '>='
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ">="
52
+ - - '>='
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: mocha
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - "~>"
59
+ - - ~>
60
60
  - !ruby/object:Gem::Version
61
61
  version: '1'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - "~>"
66
+ - - ~>
67
67
  - !ruby/object:Gem::Version
68
68
  version: '1'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: webmock
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - ~>
74
74
  - !ruby/object:Gem::Version
75
75
  version: '1'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - "~>"
80
+ - - ~>
81
81
  - !ruby/object:Gem::Version
82
82
  version: '1'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: rack-test
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - "~>"
87
+ - - ~>
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - "~>"
94
+ - - ~>
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
@@ -112,42 +112,42 @@ dependencies:
112
112
  name: smart_proxy_dynflow
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - "~>"
115
+ - - ~>
116
116
  - !ruby/object:Gem::Version
117
117
  version: 0.0.3
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - "~>"
122
+ - - ~>
123
123
  - !ruby/object:Gem::Version
124
124
  version: 0.0.3
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: net-ssh
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ">="
129
+ - - '>='
130
130
  - !ruby/object:Gem::Version
131
131
  version: '0'
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ">="
136
+ - - '>='
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: net-scp
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ">="
143
+ - - '>='
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ">="
150
+ - - '>='
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  description: |2
@@ -184,12 +184,12 @@ require_paths:
184
184
  - lib
185
185
  required_ruby_version: !ruby/object:Gem::Requirement
186
186
  requirements:
187
- - - ">="
187
+ - - '>='
188
188
  - !ruby/object:Gem::Version
189
189
  version: '0'
190
190
  required_rubygems_version: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ">="
192
+ - - '>='
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
195
  requirements: []