ridley-connectors 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fd45d75b75804bf01b13a5126297aacfd5fc455
-  data.tar.gz: 63e286faecab868eed92362d49771c1c591aad96
+  metadata.gz: 599c5217df3e7254b4578d86c7ea5d2cff2642d2
+  data.tar.gz: dd25c405a8e4d04d49841830d2d052ed4149a126
 SHA512:
-  metadata.gz: 49691e61efceb7a88fc5a4a5617b4f8364e9e074ef3d86079aedf2a7f3fa9f89d5ca59a4152f77a9be3ecc2f1d6e03512411f8d2f757d36a921843ae27fae55e
-  data.tar.gz: aabf718fdde84bdb5a210038ac319bcf53a56dc638ae39c642ab42ae7f6e65083f8d65b6a225f97fac4a4f1467b10870146e6bb4f3c389e953381c2b1d60d293
+  metadata.gz: 586525058a7a8db6d445f7a613a70099b6751b9d3d4958f631e680b70b58f69b97fb2ba90ec773145c4e2c063b9be9ed795e073571eacaeef009c82f04e0e907
+  data.tar.gz: b66f344b598132790cf6b927f54af4763100a27e9bc358ac79d50b3e549152b5af9145fad8ced11c99672ff76f13bacc21c60cc4bd72530db4d262c5ecbe47bf

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v.1.7.0
+
+* [#15](https://github.com/RiotGames/ridley-connectors/pull/15) Add retries to ssh and winrm connections
+
 ## v.1.6.0
 * [#14](https://github.com/RiotGames/ridley-connectors/pull/14) Create
   a pool of WinRM / SSH actors, configurable with options(:connector\_pool\_size)

data/lib/ridley-connectors/host_commander.rb

@@ -19,6 +19,7 @@ module Ridley
     include Ridley::Logging
 
     PORT_CHECK_TIMEOUT = 3
+    RETRY_COUNT = 3
 
     finalizer :finalize_callback
 
@@ -181,11 +182,12 @@ module Ridley
       options[:winrm]        ||= Hash.new
       options[:ssh][:port]   ||= HostConnector::SSH::DEFAULT_PORT
       options[:winrm][:port] ||= HostConnector::WinRM::DEFAULT_PORT
+      options[:retries]      ||= RETRY_COUNT
 
-      if connector_port_open?(host, options[:winrm][:port])
+      if connector_port_open?(host, options[:winrm][:port], options[:winrm][:timeout], options[:retries])
         options.delete(:ssh)
         winrm
-      elsif connector_port_open?(host, options[:ssh][:port], options[:ssh][:timeout])
+      elsif connector_port_open?(host, options[:ssh][:port], options[:ssh][:timeout], options[:retries])
         options.delete(:winrm)
         ssh
       else
@@ -214,14 +216,21 @@ module Ridley
       #   the port to attempt to connect on
       # @param [Float] wait_time ({PORT_CHECK_TIMEOUT})
       #   the number of seconds to wait
+      # @param [Int] retries ({RETRY_COUNT})
+      #   the number of times to retry the connection before counting it unavailable
       #
       # @return [Boolean]
-      def connector_port_open?(host, port, wait_time = nil)
-        defer {
-          Timeout.timeout(wait_time || PORT_CHECK_TIMEOUT) { Celluloid::IO::TCPSocket.new(host, port).close; true }
-        }
-      rescue Errno::ETIMEDOUT, Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EADDRNOTAVAIL => ex
-        false
+      def connector_port_open?(host, port, wait_time = nil, retries = RETRY_COUNT)
+        @retry_count = retries
+        begin
+          defer {
+            Timeout.timeout(wait_time || PORT_CHECK_TIMEOUT) { Celluloid::IO::TCPSocket.new(host, port).close; true }
+          }
+        rescue Errno::ETIMEDOUT, Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EADDRNOTAVAIL => ex
+          @retry_count -= 1
+          retry if @retry_count > 0
+          false
+        end
       end
 
       def finalize_callback

data/lib/ridley-connectors/version.rb

@@ -1,5 +1,5 @@
 module Ridley
   module Connectors
-    VERSION = '1.6.0'
+    VERSION = '1.7.0'
   end
 end

data/spec/unit/ridley-connectors/host_commander_spec.rb

@@ -7,13 +7,13 @@ describe Ridley::HostCommander do
   describe "#run" do
     let(:command) { "ls" }
     let(:options) do
-      { ssh: { port: 22 }, winrm: { port: 5985 } }
+      { ssh: { port: 22, timeout: 3 }, winrm: { port: 5985, timeout: 3 }, retries: 3 }
     end
 
     context "when communicating to a unix node" do
       before do
-        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(false)
-        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port], anything, anything).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything, anything).and_return(true)
       end
 
       it "sends a #run message to the ssh host connector" do
@@ -24,8 +24,8 @@ describe Ridley::HostCommander do
 
     context "when communicating to a windows node" do
       before do
-        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(true)
-        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port], anything, anything).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything, anything).and_return(false)
       end
 
       it "sends a #run message to the ssh host connector" do
@@ -38,13 +38,13 @@ describe Ridley::HostCommander do
 
   describe "#bootstrap" do
     let(:options) do
-      { ssh: { port: 22 }, winrm: { port: 5985 } }
+      { ssh: { port: 22, timeout: 3 }, winrm: { port: 5985, timeout: 3 }, retries: 3 }
     end
 
     context "when communicating to a unix node" do
       before do
-        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(false)
-        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port], anything, anything).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything, anything).and_return(true)
       end
 
       it "sends a #bootstrap message to the ssh host connector" do
@@ -56,8 +56,8 @@ describe Ridley::HostCommander do
 
     context "when communicating to a windows node" do
       before do
-        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(true)
-        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port], anything, anything).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything, anything).and_return(false)
       end
 
       it "sends a #bootstrap message to the winrm host connector" do
@@ -70,13 +70,13 @@ describe Ridley::HostCommander do
 
   describe "#chef_client" do
     let(:options) do
-      { ssh: { port: 22 }, winrm: { port: 5985 } }
+      { ssh: { port: 22, timeout: 3 }, winrm: { port: 5985, timeout: 3 }, retries: 3 }
     end
 
     context "when communicating to a unix node" do
       before do
-        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(false)
-        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port], anything, anything).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything, anything).and_return(true)
       end
 
       it "sends a #chef_client message to the ssh host connector" do
@@ -88,8 +88,8 @@ describe Ridley::HostCommander do
 
     context "when communicating to a windows node" do
       before do
-        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(true)
-        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port], anything, anything).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything, anything).and_return(false)
       end
 
       it "sends a #chef_client message to the ssh host connector" do
@@ -103,13 +103,13 @@ describe Ridley::HostCommander do
   describe "#put_secret" do
     let(:secret) { "something_secret" }
     let(:options) do
-      { ssh: { port: 22 }, winrm: { port: 5985 } }
+      { ssh: { port: 22, timeout: 3 }, winrm: { port: 5985, timeout: 3 }, retries: 3 }
     end
 
     context "when communicating to a unix node" do
       before do
-        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(false)
-        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port], anything, anything).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything, anything).and_return(true)
       end
 
       it "sends a #put_secret message to the ssh host connector" do
@@ -121,8 +121,8 @@ describe Ridley::HostCommander do
 
     context "when communicating to a windows node" do
       before do
-        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(true)
-        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port], anything, anything).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything, anything).and_return(false)
       end
 
       it "sends a #put_secret message to the ssh host connector" do
@@ -136,13 +136,13 @@ describe Ridley::HostCommander do
   describe "#ruby_script" do
     let(:command_lines) { ["line one"] }
     let(:options) do
-      { ssh: { port: 22 }, winrm: { port: 5985 } }
+      { ssh: { port: 22, timeout: 3 }, winrm: { port: 5985, timeout: 3 }, retries: 3 }
     end
 
     context "when communicating to a unix node" do
       before do
-        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(false)
-        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port], anything, anything).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything, anything).and_return(true)
       end
 
       it "sends a #ruby_script message to the ssh host connector" do
@@ -154,8 +154,8 @@ describe Ridley::HostCommander do
 
     context "when communicating to a windows node" do
       before do
-        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(true)
-        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port], anything, anything).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything, anything).and_return(false)
       end
 
       it "sends a #ruby_script message to the ssh host connector" do
@@ -168,20 +168,20 @@ describe Ridley::HostCommander do
 
   describe "#connector_for" do
     it "should return winrm if winrm is open" do
-      subject.stub(:connector_port_open?).with(host, Ridley::HostConnector::WinRM::DEFAULT_PORT).and_return(true)
+      subject.stub(:connector_port_open?).with(host, Ridley::HostConnector::WinRM::DEFAULT_PORT, anything, anything).and_return(true)
       subject.should_receive(:winrm)
       subject.connector_for(host)
     end
     
-    it "should return winrm if winrm is open" do
-      subject.stub(:connector_port_open?).with(host, Ridley::HostConnector::WinRM::DEFAULT_PORT).and_return(false)
-      subject.stub(:connector_port_open?).with(host, Ridley::HostConnector::SSH::DEFAULT_PORT, nil).and_return(true)
+    it "should return ssh if winrm is closed" do
+      subject.stub(:connector_port_open?).with(host, Ridley::HostConnector::WinRM::DEFAULT_PORT, anything, anything).and_return(false)
+      subject.stub(:connector_port_open?).with(host, Ridley::HostConnector::SSH::DEFAULT_PORT, anything, anything).and_return(true)
       subject.should_receive(:ssh)
       subject.connector_for(host)
     end
 
     it "should still set the default ports if an explicit nil is passed in" do
-      subject.stub(:connector_port_open?).with(host, Ridley::HostConnector::WinRM::DEFAULT_PORT).and_return(true)
+      subject.stub(:connector_port_open?).with(host, Ridley::HostConnector::WinRM::DEFAULT_PORT, anything, anything).and_return(true)
       subject.should_receive(:winrm)
       subject.connector_for(host, winrm: nil, ssh: nil)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley-connectors
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid