Merge pull request #743 from StatensPensjonskasse/fix-replset-accepta…

…nce-testing

Fix replset and sharding integration tests

.github/workflows/ci.yml

@@ -21,4 +21,5 @@ jobs:
     uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
     with:
       pidfile_workaround: 'false'
+      beaker_hosts: 'host1:shard.ma;host2:slave,router.a'
       beaker_facter: 'mongodb_repo_version:MongoDB:4.4,5.0,6.0,7.0'

.sync.yml

@@ -2,4 +2,6 @@
 appveyor.yml:
   delete: true
 .github/workflows/ci.yml:
-  beaker_facter: 'mongodb_repo_version:MongoDB:4.4,5.0,6.0,7.0'
+  with:
+    beaker_hosts: 'host1:shard.ma;host2:slave,router.a'
+    beaker_facter: 'mongodb_repo_version:MongoDB:4.4,5.0,6.0,7.0'

lib/puppet/provider/mongodb_database/mongodb.rb

@@ -9,12 +9,16 @@
   def self.instances
     require 'json'
 
-    pre_cmd = 'db.getMongo().setReadPref("primaryPreferred")'
-    dbs = JSON.parse mongo_eval("#{pre_cmd};EJSON.stringify(db.getMongo().getDBs())")
+    if db_ismaster
+      dbs = JSON.parse mongo_eval('EJSON.stringify(db.getMongo().getDBs())')
 
-    dbs['databases'].map do |db|
-      new(name: db['name'],
-          ensure: :present)
+      dbs['databases'].map do |db|
+        new(name: db['name'],
+            ensure: :present)
+      end
+    else
+      Puppet.warning 'Database info is available only from master host'
+      []
     end
   end
 

lib/puppet/provider/mongodb_replset/mongo.rb

@@ -284,14 +284,14 @@ def create_replica_set(alive_hosts)
     retry_sleep = 3
 
     retry_limit.times do |n|
-      if db_ismaster(alive_hosts[0]['host'])['ismaster']
-        Puppet.debug 'Replica set initialization has successfully ended'
-        return true
-      else
-        Puppet.debug "Waiting for replica initialization. Retry: #{n}"
-        sleep retry_sleep
-        next
+      alive_hosts.each do |alive_host|
+        if db_ismaster(alive_host['host'])['ismaster']
+          Puppet.debug 'Replica set initialization has successfully ended'
+          return true
+        end
       end
+      Puppet.debug "Waiting for replica initialization. Retry: #{n}"
+      sleep retry_sleep
     end
     raise Puppet::Error, "rs.initiate() failed for replicaset #{name}"
   end

lib/puppet/provider/mongodb_shard/mongo.rb

@@ -102,7 +102,7 @@ def self.shard_collection_details(obj, shard_name)
 
   def self.shard_properties(shard)
     properties = {}
-    output = mongo_command('sh.status()')
+    output = mongo_command('sh.status()')['value']
     output['shards'].each do |s|
       next unless s['_id'] == shard
 
@@ -118,7 +118,7 @@ def self.shard_properties(shard)
   end
 
   def self.shards_properties
-    output = mongo_command('sh.status()')
+    output = mongo_command('sh.status()')['value']
     properties = if output['shards'].empty?
                    []
                  else
@@ -163,64 +163,6 @@ def self.mongo_command(command, host = nil, _retries = 4)
       retry
     end
 
-    # NOTE: (spredzy) : sh.status()
-    # does not return a json stream
-    # we jsonify it so it is easier
-    # to parse and deal with it
-    if command == 'sh.status()'
-      myarr = output.split("\n")
-      myarr.shift
-      myarr.pop
-      myarr.pop
-      final_stream = []
-      prev_line = nil
-      in_shard_list = 0
-      in_chunk = 0
-      myarr.each do |line|
-        line.gsub!(%r{sharding version:}, '{ "sharding version":')
-        line.gsub!(%r{shards:}, ',"shards":[')
-        line.gsub!(%r{databases:}, '], "databases":[')
-        line.gsub!(%r{"clusterId" : ObjectId\("(.*)"\)}, '"clusterId" : "ObjectId(\'\1\')"')
-        line.gsub!(%r{\{  "_id" :}, ',{  "_id" :') if %r{_id} =~ prev_line
-        # Modification for shard
-        line = '' if line =~ %r{on :.*Timestamp}
-        if line =~ %r{_id} && in_shard_list == 1
-          in_shard_list = 0
-          last_line = final_stream.pop.strip
-          proper_line = "#{last_line}]},"
-          final_stream << proper_line
-        end
-        if line =~ %r{shard key} && in_shard_list == 1
-          shard_name = final_stream.pop.strip
-          proper_line = ",{\"#{shard_name}\":"
-          final_stream << proper_line
-        end
-        if line =~ %r{shard key} && in_shard_list.zero?
-          in_shard_list = 1
-          shard_name = final_stream.pop.strip
-          id_line = "#{final_stream.pop[0..-2]}, \"shards\": "
-          proper_line = "[{\"#{shard_name}\":"
-          final_stream << id_line
-          final_stream << proper_line
-        end
-        if in_chunk == 1
-          in_chunk = 0
-          line = "\"#{line.strip}\"}}"
-        end
-        in_chunk = 1 if line =~ %r{chunks} && in_chunk.zero?
-        line.gsub!(%r{shard key}, '{"shard key"')
-        line.gsub!(%r{chunks}, ',"chunks"')
-        final_stream << line unless line.empty?
-        prev_line = line
-      end
-      final_stream << ' ] }' if in_shard_list == 1
-      final_stream << ' ] }'
-      output = final_stream.join("\n")
-    end
-
-    # Hack to avoid non-json empty sets
-    output = '{}' if output == "null\n"
-    output.gsub!(%r{\s*}, '')
     JSON.parse(output)
   end
 end