xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

synchronize stepdowns with writes SERVER-2882

Browse Source
This commit is contained in:
Kristina
2011-05-05 12:42:14 -04:00
parent e4c3ecd92c
commit 2e7a28c0d7
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
db/instance.cpp
View File

@@ -443,7 +443,6 @@ namespace mongo {
DbMessage d(m);
const char *ns = d.getns();
assert(*ns);
uassert( 10054 , "not master", isMasterNs( ns ) );
op.debug().str << ns << ' ';
int flags = d.pullInt();
BSONObj query = d.nextJsObj();
@@ -469,6 +468,9 @@ namespace mongo {
writelock lk;
// writelock is used to synchronize stepdowns w/ writes
uassert( 10054 , "not master", isMasterNs( ns ) );
// if this ever moves to outside of lock, need to adjust check Client::Context::_finishInit
if ( ! broadcast && handlePossibleShardedMessage( m , 0 ) )
return;
@@ -483,7 +485,6 @@ namespace mongo {
DbMessage d(m);
const char *ns = d.getns();
assert(*ns);
uassert( 10056 , "not master", isMasterNs( ns ) );
op.debug().str << ns << ' ';
int flags = d.pullInt();
bool justOne = flags & RemoveOption_JustOne;
@@ -497,6 +498,10 @@ namespace mongo {
}
writelock lk(ns);
// writelock is used to synchronize stepdowns w/ writes
uassert( 10056 , "not master", isMasterNs( ns ) );
// if this ever moves to outside of lock, need to adjust check Client::Context::_finishInit
if ( ! broadcast & handlePossibleShardedMessage( m , 0 ) )
return;
@@ -580,11 +585,13 @@ namespace mongo {
DbMessage d(m);
const char *ns = d.getns();
assert(*ns);
uassert( 10058 , "not master", isMasterNs( ns ) );
op.debug().str << ns;
writelock lk(ns);
// writelock is used to synchronize stepdowns w/ writes
uassert( 10058 , "not master", isMasterNs( ns ) );
if ( handlePossibleShardedMessage( m , 0 ) )
return;