diff options
author | Eliot Horowitz <eliot@10gen.com> | 2009-04-03 14:21:00 -0400 |
---|---|---|
committer | Eliot Horowitz <eliot@10gen.com> | 2009-04-03 14:21:00 -0400 |
commit | 7b8881ffab8905f6f5ee46bea7d05b1ea09d8615 (patch) | |
tree | 150a39cd407449eb72b614d52d1ffbc464a4d47c /s/commands.cpp | |
parent | 5d81abc69044aa62241524fa3e7ee3c9aed2fbb1 (diff) | |
download | mongo-7b8881ffab8905f6f5ee46bea7d05b1ea09d8615.tar.gz |
refactor locking
Diffstat (limited to 's/commands.cpp')
-rw-r--r-- | s/commands.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/s/commands.cpp b/s/commands.cpp index 3b58628606d..af053754546 100644 --- a/s/commands.cpp +++ b/s/commands.cpp @@ -339,15 +339,10 @@ namespace mongo { log() << "splitting: " << ns << " shard: " << old << endl; - unsigned long long nextTS = grid.getNextOpTime(); - ScopedDbConnection conn( old.getServer() ); - BSONObj lockResult; - if ( ! setShardVersion( conn.conn() , ns , nextTS , true , lockResult ) ){ - log() << "setShardVersion for split failed!" << endl; - errmsg = "setShardVersion failed to lock server. is someone else doing something?"; + if ( ! lockNamespaceOnServer( old.getServer() , ns ) ){ + log() << errmsg << endl; return false; } - conn.done(); if ( middle.isEmpty() ) old.split(); |