Apply the below git patch and run the given resmoke command after building. buildscripts/resmoke.py run --suite=replica_sets jstests/replsets/bf_23831_repro.js diff --git a/jstests/replsets/bf_23831_repro.js b/jstests/replsets/bf_23831_repro.js new file mode 100644 index 00000000000..3757540dc3e --- /dev/null +++ b/jstests/replsets/bf_23831_repro.js @@ -0,0 +1,72 @@ +load("jstests/libs/fail_point_util.js"); + +const rst = new ReplSetTest({nodes: 2}); +rst.startSet(); +rst.initiate(); + +const primary = rst.getPrimary(); +const secondary = rst.getSecondary(); + +const kNumDocs = 10; +const kDbName = "BF23831DB"; +const kCollName = "testCollection"; +const kNamespace = kDbName + "." + kCollName; + +let formatProfileQuery = function(ns, cmdQuery, isQueryOp = false) { + let profileQuery = {op: isQueryOp ? "query" : "command", errCode: {$exists: false}}; + if (ns) { + profileQuery["ns"] = ns; + } + + for (const field in cmdQuery) { + profileQuery["command." + field] = cmdQuery[field]; + } + + return profileQuery; +}; + +let getNumNodesCmdRanOn = function(rsNodes, {dbName, profileQuery}) { + let numNodesCmdRanOn = 0; + rsNodes.forEach(function(node) { + let profileDB = node.getDB(dbName); + let result = profileDB.system.profile.findOne(profileQuery); + if (result != null) { + assert(profileDB.adminCommand({isMaster: 1}).secondary); + numNodesCmdRanOn += 1; + } + }); + return numNodesCmdRanOn; +}; + +let assertCmdRanOnExpectedNodes = function(rsNodes, cmdTestCase) { + cmdTestCase.cmdFunc(); + assert.eq(getNumNodesCmdRanOn(rsNodes, cmdTestCase), 1); +}; + +rst.nodes.forEach(function(node) { + assert(node.getDB(kDbName).setProfilingLevel(2)); + assert(node.getDB('admin').setProfilingLevel(2)); +}); + +const testCollPrimary = primary.getCollection(kNamespace); + +const bulk = testCollPrimary.initializeUnorderedBulkOp(); +for (let i = 0; i < kNumDocs; ++i) { + bulk.insert({_id: i, x: i}); +} +assert.commandWorked(bulk.execute()); + +const testCollSecondary = secondary.getCollection(kNamespace); + +configureFailPoint(secondary, "acquireLockDuringIntrospect"); +const cursor = testCollSecondary.find({x: {$gte: 0}}).maxTimeMS(3000); + +const cmdFunc = () => cursor.toArray(); + +const profileQuery = + formatProfileQuery(kNamespace, {find: kCollName, filter: {x: {$gte: 0}}}, true); +const dbName = kDbName; + +assertCmdRanOnExpectedNodes([primary, secondary], {cmdFunc, profileQuery, dbName}); + +rst.stopSet(); diff --git a/src/mongo/db/introspect.cpp b/src/mongo/db/introspect.cpp index f63cffbd86c..e3473d9f765 100644 --- a/src/mongo/db/introspect.cpp +++ b/src/mongo/db/introspect.cpp @@ -49,6 +49,10 @@ namespace mongo { +namespace { +MONGO_FAIL_POINT_DEFINE(acquireLockDuringIntrospect); +} + using std::endl; using std::string; using std::unique_ptr; @@ -108,6 +112,25 @@ void profile(OperationContext* opCtx, NetworkOp op) { }); try { + auto pf = makePromiseFuture<void>(); + if (acquireLockDuringIntrospect.shouldFail()) { + acquireLockDuringIntrospect.execute( + [p = std::move(pf.promise)](const auto& data) mutable { + std::thread t{[p = std::move(p)]() mutable { + auto client = getGlobalServiceContext()->makeClient("BF-23831"); + auto opCtx = client->makeOperationContext(); + { + Lock::ParallelBatchWriterMode pbwm(opCtx->lockState()); + p.emplaceValue(); + std::this_thread::sleep_for(std::chrono::milliseconds(5000)); + } + }}; + t.detach(); + }); + } else { + pf.promise.emplaceValue(); + } + pf.future.get(); const auto dbProfilingNS = NamespaceString(dbName, "system.profile"); AutoGetCollection autoColl(opCtx, dbProfilingNS, MODE_IX); Database* const db = autoColl.getDb();