test-kitchen 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25811e79e5d135e683b432c2b949b6e33ee76468
-  data.tar.gz: 13989d7ee63d36e9d6fccd56b38b2e86b857f601
+  metadata.gz: 81027eb8109e1f18afe8ab86a7868a6904a85143
+  data.tar.gz: 0d3f2807d8ed919ab730c5ca015751b465cdf97c
 SHA512:
-  metadata.gz: 5aec60ff68922a79b5c09b7fdaf39dd54b4a91e6c487eeff72477b924113ff5292c48a9bf48885e60ea3e9e88ce244f0b48ecf5ea91d47fe01b734126abc6705
-  data.tar.gz: 969e6244b72135b1fbae2ba62c89818237c5dc8eb5b3c9e2a0a0d1906bedc3142b2ed775ab1c202a63e87561315b36e4942c84d355790680eba328e754e82b2c
+  metadata.gz: d3814e745b4d08b7cb20b28fa1dad5d1503ee7a49c17cea73c6f96300bb559c37eceba74b415fd7855a13b4514b198587f45bfab9ae9bc5a4e362b4202db91f2
+  data.tar.gz: d904f5626be65776e138aaa4ed7d38365a6d30339e608dd003f2582a9ae2e35c0178103e3bb43b33ed2b971d4ac7ad70d57f54d00ac7141044e21efa9f102c00

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## [v1.9.2](https://github.com/test-kitchen/test-kitchen/tree/v1.9.2) (2016-06-09)
+[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.9.1...v1.9.2)
+
+**Implemented enhancements:**
+
+- add max scp session handling [\#1047](https://github.com/test-kitchen/test-kitchen/pull/1047) ([lamont-granquist](https://github.com/lamont-granquist))
+
+**Fixed bugs:**
+
+- Message: SCP upload failed \(open failed \(1\)\) [\#1035](https://github.com/test-kitchen/test-kitchen/issues/1035)
+
 ## [v1.9.1](https://github.com/test-kitchen/test-kitchen/tree/v1.9.1) (2016-06-02)
 [Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.9.0...v1.9.1)
 

data/lib/kitchen/driver/ssh_base.rb

@@ -53,6 +53,8 @@ module Kitchen
 
       default_config :sudo, true
       default_config :port, 22
+      # needs to be one less than the configured sshd_config MaxSessions
+      default_config :max_ssh_sessions, 9
 
       # Creates a new Driver object using the provided configuration data
       # which will be merged with any default configuration.
@@ -294,8 +296,7 @@ module Kitchen
         info("Transferring files to #{instance.to_str}")
         debug("TIMING: scp asynch upload (Kitchen::Driver::SSHBase)")
         elapsed = Benchmark.measure do
-          waits = locals.map { |local| connection.upload_path(local, remote) }
-          waits.each(&:wait)
+          transfer_path_async(locals, remote, connection)
         end
         delta = Util.duration(elapsed.real)
         debug("TIMING: scp async upload (Kitchen::Driver::SSHBase) took #{delta}")
@@ -304,6 +305,15 @@ module Kitchen
         raise ActionFailed, ex.message
       end
 
+      def transfer_path_async(locals, remote, connection)
+        waits = []
+        locals.map do |local|
+          waits.push connection.upload_path(local, remote)
+          waits.shift.wait while waits.length >= config[:max_ssh_sessions]
+        end
+        waits.each(&:wait)
+      end
+
       # Blocks until a TCP socket is available where a remote SSH server
       # should be listening.
       #

data/lib/kitchen/transport/ssh.rb

@@ -46,6 +46,8 @@ module Kitchen
       default_config :username, "root"
       default_config :keepalive, true
       default_config :keepalive_interval, 60
+      # needs to be one less than the configured sshd_config MaxSessions
+      default_config :max_ssh_sessions, 9
       default_config :connection_timeout, 15
       default_config :connection_retries, 5
       default_config :connection_retry_sleep, 1
@@ -149,12 +151,14 @@ module Kitchen
         def upload(locals, remote)
           logger.debug("TIMING: scp async upload (Kitchen::Transport::Ssh)")
           elapsed = Benchmark.measure do
-            waits = Array(locals).map do |local|
+            waits = []
+            Array(locals).map do |local|
               opts = File.directory?(local) ? { :recursive => true } : {}
 
-              session.scp.upload(local, remote, opts) do |_ch, name, sent, total|
+              waits.push session.scp.upload(local, remote, opts) do |_ch, name, sent, total|
                 logger.debug("Async Uploaded #{name} (#{total} bytes)") if sent == total
               end
+              waits.shift.wait while waits.length >= max_ssh_sessions
             end
             waits.each(&:wait)
           end
@@ -187,6 +191,10 @@ module Kitchen
           Timeout::Error
         ].freeze
 
+        # @return [Integer] cap on number of parallel ssh sessions we can use
+        # @api private
+        attr_reader :max_ssh_sessions
+
         # @return [Integer] how many times to retry when failing to execute
         #   a command or transfer files
         # @api private
@@ -286,6 +294,7 @@ module Kitchen
           @port                   = @options[:port] # don't delete from options
           @connection_retries     = @options.delete(:connection_retries)
           @connection_retry_sleep = @options.delete(:connection_retry_sleep)
+          @max_ssh_sessions       = @options.delete(:max_ssh_sessions)
           @max_wait_until_ready   = @options.delete(:max_wait_until_ready)
         end
 
@@ -335,6 +344,7 @@ module Kitchen
           :timeout                => data[:connection_timeout],
           :connection_retries     => data[:connection_retries],
           :connection_retry_sleep => data[:connection_retry_sleep],
+          :max_ssh_sessions       => data[:max_ssh_sessions],
           :max_wait_until_ready   => data[:max_wait_until_ready]
         }
 

data/lib/kitchen/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "1.9.1"
+  VERSION = "1.9.2"
 end

data/spec/kitchen/transport/ssh_spec.rb

@@ -207,6 +207,10 @@ describe Kitchen::Transport::Ssh do
 
       transport[:ssh_key].must_equal os_safe_root_path("/rooty/my_key")
     end
+
+    it "sets :max_ssh_sessions to 9 by default" do
+      transport[:max_ssh_sessions].must_equal 9
+    end
   end
 
   describe "#connection" do
@@ -648,7 +652,13 @@ describe Kitchen::Transport::Ssh::Connection do
   let(:conn)            { net_ssh_connection }
 
   let(:options) do
-    { :logger => logger, :username => "me", :hostname => "foo", :port => 22 }
+    {
+      :logger => logger,
+      :username => "me",
+      :hostname => "foo",
+      :port => 22,
+      :max_ssh_sessions => 9
+    }
   end
 
   let(:connection) do
@@ -1039,21 +1049,6 @@ describe Kitchen::Transport::Ssh::Connection do
           connection.upload(src.path, "/tmp/remote")
         end
       end
-
-      it "logs upload progress to debug" do
-        assert_scripted do
-          connection.upload(src.path, "/tmp/remote")
-        end
-
-        logged_output.string.must_match debug_line(
-          "[SSH] opening connection to me@foo<{:port=>22}>"
-        )
-        logged_output.string.lines.count { |l|
-          l =~ debug_line(
-            "Async Uploaded #{src.path} (1234 bytes)"
-          )
-        }.must_equal 1
-      end
     end
 
     describe "for a path" do
@@ -1112,31 +1107,6 @@ describe Kitchen::Transport::Ssh::Connection do
           assert_scripted { connection.upload(@dir, "/tmp/remote") }
         end
       end
-
-      it "logs upload progress to debug" do
-        with_sorted_dir_entries do
-          assert_scripted { connection.upload(@dir, "/tmp/remote") }
-        end
-
-        logged_output.string.must_match debug_line(
-          "[SSH] opening connection to me@foo<{:port=>22}>"
-        )
-        logged_output.string.lines.count { |l|
-          l =~ debug_line(
-            "Async Uploaded #{@dir}/alpha (15 bytes)"
-          )
-        }.must_equal 1
-        logged_output.string.lines.count { |l|
-          l =~ debug_line(
-            "Async Uploaded #{@dir}/subdir/beta (14 bytes)"
-          )
-        }.must_equal 1
-        logged_output.string.lines.count { |l|
-          l =~ debug_line(
-            "Async Uploaded #{@dir}/zulu (14 bytes)"
-          )
-        }.must_equal 1
-      end
     end
 
     describe "for a failed upload" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout