ridley-connectors 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e90348caa597256c09723c5a29428f75187dbb81
-  data.tar.gz: 3c6de11adb749a25c8873e3a061f6a1e33512010
+  metadata.gz: 301f0d55380eefdcc12152a5e943643c67af77aa
+  data.tar.gz: 5e1f3ac6e959b50a8f62d0ff7e76c0c20ce55c9a
 SHA512:
-  metadata.gz: 7af3ff66ae8b1d47e67c8d10d382246432a550a8ef88f3c3c92fdf35619956554e3beb135ad40ba6759eb42be70eca5b656e24ea74a99e329ab141a1ee2913cc
-  data.tar.gz: a36958116a5abd3ea500eb33e73a7dbacde1efefd36426238a0dcabdc40c50cefc4a0a3384d8a9aea4b25fbc2d4fce4c76f444d139d133f5b671919cbf1e1f6f
+  metadata.gz: 4780c2b719f082bc9e4cda5bf8b2154c0f670ce6a78d6c8d27246643e7c8b469642b6e9cdab54f91c8779c6e2073fa84a2fd51705d97a052690259a8a353cd51
+  data.tar.gz: c732f970be05ea14f0a396e165c5ffad48a81bb6df3914995474064d62e372d639d490e83942fc315efeecfc4130ec220d522efea0ed36eef9e368185ed94214

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p247
+2.1.1

data/.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.1
   - jruby-19mode
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v.2.1.1
+
+* [#24](https://github.com/RiotGames/ridley-connectors/pull/24) Fix a bug with Timeout.rb unable to interrupt Socket connections (mostly JRuby)
+
 ## v.2.1.0
 
 * [#21](https://github.com/RiotGames/ridley-connectors/pull/21) Fix bootstrappers and pathing to files moved from Ridley

data/lib/ridley-connectors/host_commander.rb

@@ -259,17 +259,17 @@ module Ridley
       #   the host to attempt to connect to
       # @param [Fixnum] port
       #   the port to attempt to connect on
-      # @param [Float] wait_time ({PORT_CHECK_TIMEOUT})
+      # @param [Float] timeout ({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, retries = RETRY_COUNT)
+      def connector_port_open?(host, port, timeout = PORT_CHECK_TIMEOUT, retries = RETRY_COUNT)
         @retry_count = retries
         begin
           defer {
-            Timeout.timeout(wait_time || PORT_CHECK_TIMEOUT) { Celluloid::IO::TCPSocket.new(host, port).close; true }
+            connectable?(host, port, timeout || PORT_CHECK_TIMEOUT)
           }
         rescue *CONNECTOR_PORT_ERRORS => ex
           @retry_count -= 1
@@ -281,6 +281,46 @@ module Ridley
         end
       end
 
+      # Check if a port on a host is able to be connected, failing if the timeout transpires.
+      #
+      # @param [String] host
+      #   the host to attempt to connect to
+      # @param [Fixnum] port
+      #   the port to attempt to connect on
+      # @param [Fixnum] timeout ({PORT_CHECK_TIMEOUT})
+      # 
+      # @return [Boolean]
+      def connectable?(host, port, timeout = PORT_CHECK_TIMEOUT)
+        addr = Socket.getaddrinfo(host, nil)
+        sockaddr = Socket.pack_sockaddr_in(port, addr[0][3])
+        socket = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
+        socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+
+        success = false
+        begin
+          socket.connect_nonblock(sockaddr)
+          success = true
+        rescue ::IO::WaitWritable
+          if ::IO.select(nil, [socket], nil, timeout || PORT_CHECK_TIMEOUT)
+            begin
+              socket.connect_nonblock(sockaddr)
+              success = true
+            rescue Errno::EISCONN
+              success = true
+            rescue
+              begin
+                socket.close
+              rescue Errno::EBADF
+                # socket is not open
+              end
+            end
+          else
+            socket.close
+          end
+        end
+        success
+      end
+
       def finalize_callback
         @connector_supervisor.async.terminate if @connector_supervisor && @connector_supervisor.alive?
       end

data/lib/ridley-connectors/version.rb

@@ -1,5 +1,5 @@
 module Ridley
   module Connectors
-    VERSION = "2.1.0"
+    VERSION = "2.1.1"
   end
 end

data/spec/support/errors.rb

@@ -0,0 +1,3 @@
+class WaitWritableError < StandardError
+  include ::IO::WaitWritable
+end

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

@@ -171,10 +171,9 @@ describe Ridley::HostCommander do
     context "when connector_port_open? experiences an error" do
       let(:socket) { double(close: true) }
 
-
-      before do
+      it "executes retry logic" do
         @times_called = 0
-        Celluloid::IO::TCPSocket.stub(:new).and_return do
+        subject.should_receive(:connectable?).twice.and_return do
           @times_called += 1
           if @times_called == 1
             raise Errno::ETIMEDOUT
@@ -182,10 +181,7 @@ describe Ridley::HostCommander do
             socket
           end
         end
-      end
 
-      it "executes retry logic" do
-        expect(Celluloid::IO::TCPSocket).to receive(:new).twice
         subject.connector_for(host)
       end
     end
@@ -247,4 +243,82 @@ describe Ridley::HostCommander do
       end
     end
   end
+
+  describe "#connectable?" do
+    let(:port) { 1234 }
+
+    before do
+      Socket
+        .stub(:getaddrinfo)
+        .with(host, nil)
+        .and_return [["AF_INET", 0, "33.33.33.10", "33.33.33.10", 2, 2, 17], 
+                     ["AF_INET", 0, "33.33.33.10", "33.33.33.10", 2, 1,  6]]
+    end
+
+    context "when the target is accessible" do
+      before do
+        calls = 0
+        Socket.any_instance.stub(:connect_nonblock).and_return do
+          calls += 1
+          if calls == 1
+            raise WaitWritableError.new
+          end
+          raise Errno::EISCONN.new
+        end
+      end
+
+      it "should return true when a connection is initiated" do
+        ::IO.stub(:select).and_return ["an array!"]
+        
+        expect(subject.send(:connectable?, host, port)).to be_true
+      end
+
+      it "should return true when a connection is initiated and an explicit nil is passed as the timeout" do
+        ::IO.stub(:select).with(anything, anything, anything, Ridley::HostCommander::PORT_CHECK_TIMEOUT).and_return ["an array!"]
+        
+        expect(subject.send(:connectable?, host, port, nil)).to be_true
+      end
+
+      it "should return false when select times out" do
+        ::IO.stub(:select).and_return nil
+
+        expect(subject.send(:connectable?, host, port)).to be_false
+      end
+
+      it "should return true when the connection does not have to wait" do
+        Socket.any_instance.stub(:connect_nonblock).and_return 0
+        
+        expect(subject.send(:connectable?, host, port)).to be_true
+      end
+    end
+
+    Ridley::HostCommander::CONNECTOR_PORT_ERRORS.each do |error|
+      context "when the target causes #{error}" do
+        before do
+          calls = 0
+          Socket.any_instance.stub(:connect_nonblock).and_return do
+            calls += 1
+            if calls == 1
+              raise WaitWritableError.new
+            end
+            raise error.new
+          end
+
+          ::IO.stub(:select).and_return []
+        end
+
+        context "should return false" do
+          it "" do
+            expect(subject.send(:connectable?, host, port)).to be_false
+          end
+
+          it "when the socket close throws EBAFD" do
+            Socket.any_instance.stub(:close).and_return { raise Errno::EBADF.new }
+
+            expect(subject.send(:connectable?, host, port)).to be_false
+          end
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley-connectors
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.0.pre
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.0.pre
 - !ruby/object:Gem::Dependency
   name: erubis
   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-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: ridley
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: buff-ruby_engine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 description: A Connector API for talking to nodes managed by Chef
@@ -117,9 +117,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -153,6 +153,7 @@ files:
 - spec/fixtures/my-fake.pem
 - spec/spec_helper.rb
 - spec/support/actor_mocking.rb
+- spec/support/errors.rb
 - spec/support/spec_helpers.rb
 - spec/unit/ridley-connectors/bootstrap_context/unix_spec.rb
 - spec/unit/ridley-connectors/bootstrap_context/windows_spec.rb
@@ -176,17 +177,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Connector API for talking to nodes managed by Chef
@@ -195,6 +196,7 @@ test_files:
 - spec/fixtures/my-fake.pem
 - spec/spec_helper.rb
 - spec/support/actor_mocking.rb
+- spec/support/errors.rb
 - spec/support/spec_helpers.rb
 - spec/unit/ridley-connectors/bootstrap_context/unix_spec.rb
 - spec/unit/ridley-connectors/bootstrap_context/windows_spec.rb