summaryrefslogtreecommitdiff
path: root/src/mongo/s/d_split.cpp
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2014-05-30 09:56:36 -0400
committerKaloian Manassiev <kaloian.manassiev@mongodb.com>2014-05-30 11:44:18 -0400
commit4edbe14669b7804180d8b58549e257ceb679bb1d (patch)
treea72389bb84137c11755fd4f55d7218f190b0456c /src/mongo/s/d_split.cpp
parentbee249ac8907cc9de6b19ba87c3fcb074d84b1a3 (diff)
downloadmongo-4edbe14669b7804180d8b58549e257ceb679bb1d.tar.gz
SERVER-13961 Pass LockState to DBWrite and DBRead directly
This is part of the changes to move LockState be part of OperationContext and not retrieved from TLS.
Diffstat (limited to 'src/mongo/s/d_split.cpp')
-rw-r--r--src/mongo/s/d_split.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/s/d_split.cpp b/src/mongo/s/d_split.cpp
index 04e17d553e3..7bb1d4d82d7 100644
--- a/src/mongo/s/d_split.cpp
+++ b/src/mongo/s/d_split.cpp
@@ -119,7 +119,7 @@ namespace mongo {
return false;
}
- Client::ReadContext ctx( ns );
+ Client::ReadContext ctx(txn, ns);
Collection* collection = ctx.ctx().db()->getCollection( ns );
if ( !collection ) {
errmsg = "ns not found";
@@ -275,7 +275,7 @@ namespace mongo {
{
// Get the size estimate for this namespace
- Client::ReadContext ctx( ns );
+ Client::ReadContext ctx(txn, ns);
Collection* collection = ctx.ctx().db()->getCollection( ns );
if ( !collection ) {
errmsg = "ns not found";
@@ -824,7 +824,7 @@ namespace mongo {
maxVersion.incMinor();
{
- Lock::DBWrite writeLk( ns );
+ Lock::DBWrite writeLk(txn->lockState(), ns);
shardingState.splitChunk( ns , min , max , splitKeys , maxVersion );
}
@@ -858,7 +858,7 @@ namespace mongo {
// If one of the chunks has only one object in it we should move it
for (int i=1; i >= 0 ; i--){ // high chunk more likely to have only one obj
- Client::ReadContext ctx( ns );
+ Client::ReadContext ctx(txn, ns);
Collection* collection = ctx.ctx().db()->getCollection( ns );
verify( collection );