Added guards to rabbitmq version to determine if it's running, otherwise try new options every other iteration

Author: nmaludy

lib/puppet/provider/rabbitmq_cli.rb

@@ -72,10 +72,10 @@ def self.run_with_retries(count = 30, step = 6, timeout = 10)
           yield
         end
       rescue Puppet::ExecutionFailure => e
-        Puppet.debug "Command failed, retrying: #{e.message}"
+        Puppet.info "Command failed, retrying: #{e.message}"
         sleep step
       rescue Timeout::Error
-        Puppet.debug 'Command failed, retrying'
+        Puppet.info 'Command failed, retrying'
         sleep step
       else
         Puppet.debug 'Command succeeded'

lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb

@@ -5,24 +5,44 @@
   confine feature: :posix
 
   def self.plugin_list
+    retry_iter = 0
     list = run_with_retries do
-      # Starting in RabbitMQ 3.6.7 pass in -e to list both implicitly and explicitly enabled plugins.
-      # If you pass in -E instead, then only explicitly enabled plugins are listed.
-      # Implicitly enabled plugins are those that were enabled as a dependency of another plugin/
-      # If we do not pass in -e then the order if plugin installation matters within the puppet
-      # code. Example, if Plugin A depends on Plugin B and we install Plugin B first it will
-      # implicitly enable Plugin A. Then when we go to run Puppet a second time without the
-      # -e parameter, we won't see Plugin A as being enabled so we'll try to install it again.
-      # To preserve idempotency we should get all enabled plugins regardless of implicitly or
-      # explicitly enabled.
-      if Puppet::Util::Package.versioncmp(rabbitmq_version, '3.6.7') >= 0
-        # also pass in -q to suppress informational messages that break our parsing
-        rabbitmqplugins('list', '-e', '-m', '-q')
-      else
-        rabbitmqplugins('list', '-E', '-m')
+      begin
+        # Starting in RabbitMQ 3.6.7 pass in -e to list both implicitly and explicitly enabled plugins.
+        # If you pass in -E instead, then only explicitly enabled plugins are listed.
+        # Implicitly enabled plugins are those that were enabled as a dependency of another plugin/
+        # If we do not pass in -e then the order if plugin installation matters within the puppet
+        # code. Example, if Plugin A depends on Plugin B and we install Plugin B first it will
+        # implicitly enable Plugin A. Then when we go to run Puppet a second time without the
+        # -e parameter, we won't see Plugin A as being enabled so we'll try to install it again.
+        # To preserve idempotency we should get all enabled plugins regardless of implicitly or
+        # explicitly enabled.
+        #
+        # if we can't determine the running version of rabbitmq, then try the new options
+        # vs old options every other time (modulo 2)
+        if rabbitmq_running
+          if Puppet::Util::Package.versioncmp(rabbitmq_version, '3.6.7') >= 0
+            # also pass in -q to suppress informational messages that break our parsing
+            Puppet.info('Running new plugins command because rabbitmq version is good')
+            rabbitmqplugins('list', '-e', '-m', '-q')
+          else
+            Puppet.info('Running new plugins command because rabbitmq version is old')
+            rabbitmqplugins('list', '-E', '-m')
+          end
+        elsif retry_iter.modulo(2).zero?
+          Puppet.info('Running new plugins command because rabbitmq isnt running iter mod 0')
+          rabbitmqplugins('list', '-e', '-m', '-q')
+        else
+          Puppet.info('Running new plugins command because rabbitmq isnt running iter mod 1')
+          rabbitmqplugins('list', '-E', '-m')
+        end
+      ensure
+        retry_iter += 1
       end
     end
-    list.split(%r{\n})
+    plugins = list.split(%r{\n})
+    Puppet.info("Existing plugins list: #{plugins}")
+    plugins
   end
 
   def self.instances

spec/acceptance/parameter_spec.rb

@@ -32,8 +32,8 @@ class { 'rabbitmq':
       }
       EOS
 
-      apply_manifest(pp, catch_failures: true, debug: true)
-      apply_manifest(pp, catch_changes: true, debug: true)
+      apply_manifest(pp, catch_failures: true)
+      apply_manifest(pp, catch_changes: true)
     end
 
     # rubocop:disable RSpec/MultipleExpectations

spec/acceptance/rabbitmqadmin_spec.rb

@@ -14,7 +14,7 @@ class { 'erlang': epel_enable => true}
       }
       EOS
 
-      apply_manifest(pp, catch_failures: true, debug: true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file('/var/lib/rabbitmq/rabbitmqadmin') do
@@ -36,7 +36,7 @@ class { 'erlang': epel_enable => true}
       EOS
 
       shell('rm -f /var/lib/rabbitmq/rabbitmqadmin')
-      apply_manifest(pp, catch_failures: true, debug: true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file('/var/lib/rabbitmq/rabbitmqadmin') do
@@ -73,7 +73,7 @@ class { 'erlang': epel_enable => true}
       EOS
 
       shell('rm -f /var/lib/rabbitmq/rabbitmqadmin')
-      apply_manifest(pp_pre, catch_failures: true, debug: true)
+      apply_manifest(pp_pre, catch_failures: true)
       apply_manifest(pp, catch_failures: true)
     end
 

spec/spec_helper_acceptance.rb

@@ -99,6 +99,6 @@
   end
 
   it 'applies a second time without changes' do
-    apply_manifest(pp, catch_changes: true, debug: true)
+    apply_manifest(pp, catch_changes: true)
   end
 end

spec/unit/puppet/provider/rabbitmq_plugin/rabbitmqctl_spec.rb

@@ -45,12 +45,14 @@
 
     context 'with RabbitMQ version >=3.6.7' do
       it 'returns a list of plugins' do
+        provider.class.expects(:rabbitmq_running).returns true
         provider.class.expects(:rabbitmq_version).returns '3.6.7'
         provider.class.expects(:rabbitmqplugins).with('list', '-e', '-m', '-q').returns("foo\nbar\nbaz\n")
         expect(provider.class.plugin_list).to eq(%w[foo bar baz])
       end
 
       it 'handles no training newline properly' do
+        provider.class.expects(:rabbitmq_running).returns true
         provider.class.expects(:rabbitmq_version).returns '3.6.7'
         provider.class.expects(:rabbitmqplugins).with('list', '-e', '-m', '-q').returns("foo\nbar")
         expect(provider.class.plugin_list).to eq(%w[foo bar])
@@ -59,12 +61,14 @@
 
     context 'with RabbitMQ version <3.6.7' do
       it 'returns a list of plugins' do
+        provider.class.expects(:rabbitmq_running).returns true
         provider.class.expects(:rabbitmq_version).returns '3.6.6'
         provider.class.expects(:rabbitmqplugins).with('list', '-E', '-m').returns("foo\nbar\nbaz\n")
         expect(provider.class.plugin_list).to eq(%w[foo bar baz])
       end
 
       it 'handles no training newline properly' do
+        provider.class.expects(:rabbitmq_running).returns true
         provider.class.expects(:rabbitmq_version).returns '3.6.6'
         provider.class.expects(:rabbitmqplugins).with('list', '-E', '-m').returns("foo\nbar")
         expect(provider.class.plugin_list).to eq(%w[foo bar])