File tree Expand file tree Collapse file tree 3 files changed +4
-4
lines changed
lib/puppet/provider/mongodb_database
unit/puppet/provider/mongodb_database Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change 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 |
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change 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
You can’t perform that action at this time.
0 commit comments