Skip to content

Commit 29931c1

Browse files
committed
SERVER-4328 wrong lock for commitNow was messing up sharding with the new dblocking
1 parent 2feeb81 commit 29931c1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/mongo/s/d_migrate.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1571,7 +1571,7 @@ namespace mongo {
15711571
log() << "migrate commit succeeded flushing to secondaries for '" << ns << "' " << min << " -> " << max << migrateLog;
15721572

15731573
{
1574-
readlock lk(ns); // commitNow() currently requires it
1574+
Lock::GlobalRead lk;
15751575

15761576
// if durability is on, force a write to journal
15771577
if ( getDur().commitNow() ) {

src/mongo/util/assert_util.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ namespace mongo {
179179
assertionCount.condrollover( ++assertionCount.warning );
180180
tlog() << "Assertion: " << msgid << ":" << msg << endl;
181181
raiseError(msgid,msg && *msg ? msg : "massert failure");
182-
breakpoint();
182+
//breakpoint();
183183
printStackTrace();
184184
throw MsgAssertionException(msgid, msg);
185185
}

0 commit comments

Comments
 (0)