Skip to content

Commit 52f40bd

Browse files
author
Johan De Wit
committed
[Provider] replace obsolete methods for server selection
1 parent 5a561c9 commit 52f40bd

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

lib/puppet/provider/mongodb_database/mongodb.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
def self.instances
1010
require 'json'
1111

12-
pre_cmd = 'try { rs.secondaryOk() } catch (err) { rs.slaveOk() }'
12+
pre_cmd = 'db.getMongo().setReadPref("primaryPreferred")'
1313
dbs = JSON.parse mongo_eval("#{pre_cmd};printjson(db.getMongo().getDBs())")
1414

1515
dbs['databases'].map do |db|

spec/acceptance/replset_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class { 'mongodb::client': }
6767

6868
it 'checks the data on the slave' do
6969
sleep(10)
70-
on hosts_as('slave'), %{mongo --verbose --eval 'try { rs.secondaryOk() } catch (err) { rs.slaveOk() }; printjson(db.test.findOne({name:"test1"}))'} do |r|
70+
on hosts_as('slave'), %{mongo --verbose --eval 'db.getMongo().setReadPref("primaryPreferred"); printjson(db.test.findOne({name:"test1"}))'} do |r|
7171
expect(r.stdout).to match %r{some value}
7272
end
7373
end
@@ -196,7 +196,7 @@ class { 'mongodb::server':
196196

197197
it 'checks the data on the slave' do
198198
sleep(10)
199-
on hosts_as('slave'), %{mongo test --verbose --eval 'load("/root/.mongoshrc.js");try { rs.secondaryOk() } catch (err) { rs.slaveOk() };printjson(db.dummyData.findOne())'} do |r|
199+
on hosts_as('slave'), %{mongo test --verbose --eval 'load("/root/.mongoshrc.js");db.getMongo().setReadPref("primaryPreferred");printjson(db.dummyData.findOne())'} do |r|
200200
expect(r.stdout).to match %r{created_by_puppet}
201201
end
202202
end

spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
tmp = Tempfile.new('test')
3939
mongodconffile = tmp.path
4040
allow(provider.class).to receive(:mongod_conf_file).and_return(mongodconffile)
41-
allow(provider.class).to receive(:mongo_eval).with('try { rs.secondaryOk() } catch (err) { rs.slaveOk() };printjson(db.getMongo().getDBs())').and_return(raw_dbs)
41+
allow(provider.class).to receive(:mongo_eval).with('db.getMongo().setReadPref("primaryPreferred");printjson(db.getMongo().getDBs())').and_return(raw_dbs)
4242
allow(provider.class).to receive(:db_ismaster).and_return(true)
4343
end
4444

0 commit comments

Comments
 (0)