diff options
| author | Gregory Wlodarek <gregory.wlodarek@mongodb.com> | 2020-01-28 21:08:04 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-01-31 04:48:40 +0000 |
| commit | c2d35dd6214978959a9cfc5dcb813d62ae8981ef (patch) | |
| tree | c2f527cc549bebaf076b1628bcb4482e3b5e4c55 /src/mongo/db/stats | |
| parent | 39b922938dfa89bfedb7b45f05ff05d585ccdfc8 (diff) | |
| download | mongo-c2d35dd6214978959a9cfc5dcb813d62ae8981ef.tar.gz | |
SERVER-45137 Remove namespaces from Top when collections are renamed
create mode 100644 jstests/noPassthroughWithMongod/top_rename.js
Diffstat (limited to 'src/mongo/db/stats')
| -rw-r--r-- | src/mongo/db/stats/top.cpp | 14 | ||||
| -rw-r--r-- | src/mongo/db/stats/top.h | 3 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/mongo/db/stats/top.cpp b/src/mongo/db/stats/top.cpp index e9fea54b0cc..1cba425396c 100644 --- a/src/mongo/db/stats/top.cpp +++ b/src/mongo/db/stats/top.cpp @@ -85,12 +85,6 @@ void Top::record(OperationContext* opCtx, auto hashedNs = UsageMap::hasher().hashed_key(ns); stdx::lock_guard<SimpleMutex> lk(_lock); - if ((command || logicalOp == LogicalOp::opQuery) && - _collDropNs.find(ns.toString()) != _collDropNs.end()) { - _collDropNs.erase(ns.toString()); - return; - } - CollectionData& coll = _usage[hashedNs]; _record(opCtx, coll, logicalOp, lockType, micros, readWriteType); } @@ -140,15 +134,9 @@ void Top::_record(OperationContext* opCtx, } } -void Top::collectionDropped(const NamespaceString& nss, bool databaseDropped) { +void Top::collectionDropped(const NamespaceString& nss) { stdx::lock_guard<SimpleMutex> lk(_lock); _usage.erase(nss.ns()); - - if (!databaseDropped) { - // If a collection drop occurred, there will be a subsequent call to record for this - // collection namespace which must be ignored. This does not apply to a database drop. - _collDropNs.insert(nss.toString()); - } } void Top::cloneMap(Top::UsageMap& out) const { diff --git a/src/mongo/db/stats/top.h b/src/mongo/db/stats/top.h index 2fcbb620f6c..635fda68a1e 100644 --- a/src/mongo/db/stats/top.h +++ b/src/mongo/db/stats/top.h @@ -108,7 +108,7 @@ public: void cloneMap(UsageMap& out) const; - void collectionDropped(const NamespaceString& nss, bool databaseDropped = false); + void collectionDropped(const NamespaceString& nss); /** * Appends the collection-level latency statistics @@ -154,7 +154,6 @@ private: mutable SimpleMutex _lock; OperationLatencyHistogram _globalHistogramStats; UsageMap _usage; - std::set<std::string> _collDropNs; }; } // namespace mongo |