knife-windows 3.0.10 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 429cae6c473c57982b128b35647dc1616c0571bc24edce1a46b1eb3604700379
-  data.tar.gz: 4a99a1b6187c711adf545a8ce16e7f1fe9659751b39cedf0be96cbfb33eb2dc9
+  metadata.gz: 5ed600d9a1b420d45bc08d7eb66179a9cf83c64434a40b5fed4f54e90d9d286c
+  data.tar.gz: cdf15fe2cd5359009344941b2506fbd8cddc40d1075e8aaa8da56b3206c97626
 SHA512:
-  metadata.gz: cc0a6dc93a56a940f11bd5ff22774b0c02d799cb11465d523c18125335a708c7a50efa67fc63ac53e3325f8219305292fbb8abb5f2c4fabe8c5dbb38f5e4f3ec
-  data.tar.gz: 55a995dcd21e06fc8420f502f27d9fe7bacf2d4ded1a0c7e890bb3504fd9e4ce5b87f1b8aae43961c468232c24da861c3c458f9b9424edd39e02f5d00a974b75
+  metadata.gz: 4d0bf4cbbeb4a9d24a6a029e8a8e65f8f40e453379ab2552c1694a60c48c130836eafdaa6c4cdc9c2839e0722caf118a1abd26b8ddbcfc72a7cdede4e4a30cd6
+  data.tar.gz: 940797a147aebee7dab7c95f1a9a4ae4ee34b1c4c8888079dbccabf9783383c3a4cd5a75d0ab9527df6e06324d74e015d844d4e20f2f6fc5c740eafc94903db2

data/lib/chef/knife/winrm_knife_base.rb

@@ -118,14 +118,16 @@ class Chef
           def relay_winrm_command(command)
             Chef::Log.debug(command)
             @session_results = []
-
             queue = Queue.new
             @winrm_sessions.each { |s| queue << s }
-            # These nils will kill the Threads once no more sessions are left
-            locate_config_value(:concurrency).times { queue << nil }
+            num_sessions = locate_config_value(:concurrency)
+            num_targets = @winrm_sessions.length
+            num_sessions = (num_sessions.nil? || num_sessions == 0) ? num_targets : [num_sessions, num_targets].min
 
+            # These nils will kill the Threads once no more sessions are left
+            num_sessions.times { queue << nil }
             threads = []
-            locate_config_value(:concurrency).times do
+            num_sessions.times do
               threads << Thread.new do
                 while session = queue.pop
                   run_command_in_thread(session, command)

data/lib/chef/knife/winrm_shared_options.rb

@@ -43,8 +43,7 @@ class Chef
           option :concurrency,
             short: "-C NUM",
             long: "--concurrency NUM",
-            description: "The number of allowed concurrent connections",
-            default: 1,
+            description: "The number of allowed concurrent connections - default is number of hosts",
             proc: lambda { |o| o.to_i }
         end
       end

data/lib/knife-windows/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Windows
-    VERSION = "3.0.10".freeze
+    VERSION = "3.0.11".freeze
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

data/spec/unit/knife/winrm_spec.rb

@@ -495,4 +495,95 @@ describe Chef::Knife::Winrm do
       end
     end
   end
+
+  context "Impact of concurrency value when target nodes are 3" do
+    let(:winrm_user) { "testuser" }
+    let(:transport) { "plaintext" }
+    let(:password) { "testpassword" }
+    let(:protocol) { "basic" }
+    let(:knife_args) do
+      [
+        "-m", "localhost knownhost somehost",
+        "-x", winrm_user,
+        "-P", password,
+        "-w", transport,
+        "--winrm-authentication-protocol", protocol,
+        "echo helloworld"
+      ]
+    end
+    let(:winrm_connection) { Dummy::Connection.new }
+
+    subject { Chef::Knife::Winrm.new(knife_args) }
+
+    context "when concurrency limit is not set" do
+      it "spawns a number of connection threads equal to the number of target nodes" do
+        allow(subject).to receive(:run_command_in_thread).and_return("echo helloworld")
+        expect(Thread).to receive(:new).exactly(3).times.and_call_original
+        subject.configure_session
+        subject.relay_winrm_command(knife_args.last)
+      end
+    end
+
+    context "when concurrency limit is set" do
+      it "starts only the required number of threads when there are fewer targets than threads" do
+        knife_args.push("-C", "4")
+        allow(subject).to receive(:run_command_in_thread).and_return("echo helloworld")
+        expect(Thread).to receive(:new).exactly(3).times.and_call_original
+        subject.configure_session
+        subject.relay_winrm_command(knife_args.last)
+      end
+      it "starts only the requested number of threads when there are as many targets as threads" do
+        knife_args.push("-C", "3")
+        allow(subject).to receive(:run_command_in_thread).and_return("echo helloworld")
+        expect(Thread).to receive(:new).exactly(3).times.and_call_original
+        subject.configure_session
+        subject.relay_winrm_command(knife_args.last)
+      end
+      it "starts only the requested number of threads when there are more targets then threads" do
+        knife_args.push("-C", "2")
+        allow(subject).to receive(:run_command_in_thread).and_return("echo helloworld")
+        expect(Thread).to receive(:new).exactly(2).times.and_call_original
+        subject.configure_session
+        subject.relay_winrm_command(knife_args.last)
+      end
+    end
+
+    context "should call run_command_in_thread thrice when" do
+      it "concurrency not set" do
+        expect(subject).to receive(:run_command_in_thread).thrice
+        subject.configure_session
+        subject.relay_winrm_command(knife_args.last)
+      end
+      it "concurrency set to 4" do
+        knife_args.push("-C", "4")
+        expect(subject).to receive(:run_command_in_thread).thrice
+        subject.configure_session
+        subject.relay_winrm_command(knife_args.last)
+      end
+      it "concurrency set to 3" do
+        knife_args.push("-C", "3")
+        expect(subject).to receive(:run_command_in_thread).thrice
+        subject.configure_session
+        subject.relay_winrm_command(knife_args.last)
+      end
+      it "concurrency set to 2" do
+        knife_args.push("-C", "2")
+        expect(subject).to receive(:run_command_in_thread).thrice
+        subject.configure_session
+        subject.relay_winrm_command(knife_args.last)
+      end
+      it "concurrency set to 1" do
+        knife_args.push("-C", "1")
+        expect(subject).to receive(:run_command_in_thread).thrice
+        subject.configure_session
+        subject.relay_winrm_command(knife_args.last)
+      end
+      it "concurrency set to 0" do
+        knife_args.push("-C", "0")
+        expect(subject).to receive(:run_command_in_thread).thrice
+        subject.configure_session
+        subject.relay_winrm_command(knife_args.last)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-windows
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.11
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef