diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2022-09-13 09:23:07 +0200 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-09-15 08:12:08 +0000 |
| commit | fa920335ed6a41efa417e5c41940cd28a4a36829 (patch) | |
| tree | eb7454e4661ce8e3d38c08a12b2609eea926edbb /src/mongo/db/curop.cpp | |
| parent | d8901a2835d3f464d394631d85dc7aa9493fc095 (diff) | |
| download | mongo-fa920335ed6a41efa417e5c41940cd28a4a36829.tar.gz | |
SERVER-69523 Only allow METADATA and MUTEX lock acqisitions with OpContext
This makes mutex acquisitions both interruptible and allows the lock
manager to be able to inspect the lock acqusitions so far.
Diffstat (limited to 'src/mongo/db/curop.cpp')
| -rw-r--r-- | src/mongo/db/curop.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/mongo/db/curop.cpp b/src/mongo/db/curop.cpp index b5e53e339d3..36f6ba7ebd6 100644 --- a/src/mongo/db/curop.cpp +++ b/src/mongo/db/curop.cpp @@ -41,7 +41,6 @@ #include "mongo/db/commands.h" #include "mongo/db/commands/server_status_metric.h" #include "mongo/db/concurrency/d_concurrency.h" -#include "mongo/db/concurrency/locker.h" #include "mongo/db/json.h" #include "mongo/db/prepare_conflict_tracker.h" #include "mongo/db/profile_filter.h" @@ -60,11 +59,7 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault - namespace mongo { - -using std::string; - namespace { auto& oplogGetMoreStats = makeServerStatusMetric<TimerStats>("repl.network.oplogGetMoresProcessed"); @@ -1623,7 +1618,7 @@ void OpDebug::AdditiveMetrics::incrementPrepareReadConflicts(long long n) { prepareReadConflicts.fetchAndAdd(n); } -string OpDebug::AdditiveMetrics::report() const { +std::string OpDebug::AdditiveMetrics::report() const { StringBuilder s; OPDEBUG_TOSTRING_HELP_OPTIONAL("keysExamined", keysExamined); |