mirror of
https://github.com/mongodb/mongo.git
synced 2024-12-01 09:32:32 +01:00
Merge branch 'master' of github.com:mongodb/mongo
This commit is contained in:
commit
22b2a2988c
@ -62,7 +62,7 @@ namespace mongo {
|
||||
rsOplogDetails = nsdetails(logns);
|
||||
massert(13389, "local.oplog.rs missing. did you drop it? if so restart server", rsOplogDetails);
|
||||
}
|
||||
Client::Context ctx( "" , localDB, false );
|
||||
Client::Context ctx( logns , localDB, false );
|
||||
{
|
||||
int len = op.objsize();
|
||||
Record *r = theDataFileMgr.fast_oplog_insert(rsOplogDetails, logns, len);
|
||||
@ -136,7 +136,7 @@ namespace mongo {
|
||||
rsOplogDetails = nsdetails(logns);
|
||||
massert(13347, "local.oplog.rs missing. did you drop it? if so restart server", rsOplogDetails);
|
||||
}
|
||||
Client::Context ctx( "" , localDB, false );
|
||||
Client::Context ctx( logns , localDB, false );
|
||||
r = theDataFileMgr.fast_oplog_insert(rsOplogDetails, logns, len);
|
||||
/* todo: now() has code to handle clock skew. but if the skew server to server is large it will get unhappy.
|
||||
this code (or code in now() maybe) should be improved.
|
||||
@ -230,7 +230,7 @@ namespace mongo {
|
||||
localOplogMainDetails = nsdetails(logNS);
|
||||
assert( localOplogMainDetails );
|
||||
}
|
||||
Client::Context ctx( "" , localDB, false );
|
||||
Client::Context ctx( logNS , localDB, false );
|
||||
r = theDataFileMgr.fast_oplog_insert(localOplogMainDetails, logNS, len);
|
||||
} else {
|
||||
Client::Context ctx( logNS, dbpath, 0, false );
|
||||
|
Loading…
Reference in New Issue
Block a user