diff options
| author | Randolph Tan <randolph@10gen.com> | 2014-03-11 16:10:42 -0400 |
|---|---|---|
| committer | Randolph Tan <randolph@10gen.com> | 2014-03-13 12:42:21 -0400 |
| commit | 858f12a88f949ac8bc0ad009c2ce6a2c8558508a (patch) | |
| tree | 64f15c9d4f1387edd4ef57d84b4b7922eb9bbb19 /jstests | |
| parent | d1fa029106e01f1762e96af3d85183d849eb1d88 (diff) | |
| download | mongo-858f12a88f949ac8bc0ad009c2ce6a2c8558508a.tar.gz | |
SERVER-13137 Make sure secondary is up to date before querying in sharding_rs2.js
Diffstat (limited to 'jstests')
| -rw-r--r-- | jstests/slowNightly/sharding_rs2.js | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/jstests/slowNightly/sharding_rs2.js b/jstests/slowNightly/sharding_rs2.js index c5a22d95b8f..b961d22a9d6 100644 --- a/jstests/slowNightly/sharding_rs2.js +++ b/jstests/slowNightly/sharding_rs2.js @@ -1,7 +1,7 @@ // mostly for testing mongos w/replica sets - -s = new ShardingTest( "rs2" , 2 , 2 , 1 , { rs : true , chunksize : 1 } ) +var s = new ShardingTest({ shards: { rs0: { nodes: 2 }, rs1: { nodes: 2 }}, + verbose: 1, chunkSize: 1 }); db = s.getDB( "test" ) t = db.foo @@ -24,7 +24,7 @@ function countNodes(){ return x.host.split( "," ).length } -assert.eq( 3 , countNodes() , "A1" ) +assert.eq( 2 , countNodes() , "A1" ) rs = s.getRSEntry( serverName ); rs.test.add() @@ -41,7 +41,7 @@ assert.soon( try { printjson( rs.test.getMaster().getDB("admin").runCommand( "isMaster" ) ) s.config.shards.find().forEach( printjsononeline ); - return countNodes() == 4; + return countNodes() == 3; } catch ( e ){ print( e ); @@ -125,7 +125,11 @@ s.adminCommand( { split : "test.foo" , middle : { x : 50 } } ) db.printShardingStatus() other = s.config.shards.findOne( { _id : { $ne : serverName } } ); -s.adminCommand( { moveChunk : "test.foo" , find : { x : 10 } , to : other._id, _waitForDelete : true } ) +assert.commandWorked(s.getDB('admin').runCommand({ moveChunk: "test.foo", + find: { x: 10 }, + to: other._id, + _secondaryThrottle: true, + _waitForDelete: true })); assert.eq( 100 , t.count() , "C3" ) assert.eq( 50 , rs.test.getMaster().getDB( "test" ).foo.count() , "C4" ) |