diff options
| author | Blake Oler <blake.oler@mongodb.com> | 2020-04-23 16:38:20 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-04-27 17:16:42 +0000 |
| commit | 217c7ac9d6eed45639ff53cd45fffa1dd959c20b (patch) | |
| tree | 019ca533eeb2da6ad00647b3babbd6ac9bd7dc9d | |
| parent | 1283200126992fe392bfcb6b39b216fa8e85d3ab (diff) | |
| download | mongo-217c7ac9d6eed45639ff53cd45fffa1dd959c20b.tar.gz | |
SERVER-47738 Don't include CatalogCache blocked operation metrics on mongod
(cherry picked from commit 341e5569281dfcf20422192f7db34f4a228bf846)
| -rw-r--r-- | src/mongo/s/catalog_cache.cpp | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/src/mongo/s/catalog_cache.cpp b/src/mongo/s/catalog_cache.cpp index 0ec5e8a7019..db6e09a1379 100644 --- a/src/mongo/s/catalog_cache.cpp +++ b/src/mongo/s/catalog_cache.cpp @@ -47,6 +47,7 @@ #include "mongo/s/client/shard_registry.h" #include "mongo/s/database_version_helpers.h" #include "mongo/s/grid.h" +#include "mongo/s/is_mongos.h" #include "mongo/s/mongos_server_parameters_gen.h" #include "mongo/s/stale_exception.h" #include "mongo/util/concurrency/with_lock.h" @@ -582,7 +583,7 @@ void CatalogCache::report(BSONObjBuilder* builder) const { void CatalogCache::checkAndRecordOperationBlockedByRefresh(OperationContext* opCtx, mongo::LogicalOp opType) { - if (!operationBlockedBehindCatalogCacheRefresh(opCtx)) { + if (!isMongos() || !operationBlockedBehindCatalogCacheRefresh(opCtx)) { return; } @@ -923,23 +924,25 @@ void CatalogCache::Stats::report(BSONObjBuilder* builder) const { builder->append("countFailedRefreshes", countFailedRefreshes.load()); - BSONObjBuilder operationsBlockedByRefreshBuilder( - builder->subobjStart("operationsBlockedByRefresh")); - - operationsBlockedByRefreshBuilder.append("countAllOperations", - operationsBlockedByRefresh.countAllOperations.load()); - operationsBlockedByRefreshBuilder.append("countInserts", - operationsBlockedByRefresh.countInserts.load()); - operationsBlockedByRefreshBuilder.append("countQueries", - operationsBlockedByRefresh.countQueries.load()); - operationsBlockedByRefreshBuilder.append("countUpdates", - operationsBlockedByRefresh.countUpdates.load()); - operationsBlockedByRefreshBuilder.append("countDeletes", - operationsBlockedByRefresh.countDeletes.load()); - operationsBlockedByRefreshBuilder.append("countCommands", - operationsBlockedByRefresh.countCommands.load()); - - operationsBlockedByRefreshBuilder.done(); + if (isMongos()) { + BSONObjBuilder operationsBlockedByRefreshBuilder( + builder->subobjStart("operationsBlockedByRefresh")); + + operationsBlockedByRefreshBuilder.append( + "countAllOperations", operationsBlockedByRefresh.countAllOperations.load()); + operationsBlockedByRefreshBuilder.append("countInserts", + operationsBlockedByRefresh.countInserts.load()); + operationsBlockedByRefreshBuilder.append("countQueries", + operationsBlockedByRefresh.countQueries.load()); + operationsBlockedByRefreshBuilder.append("countUpdates", + operationsBlockedByRefresh.countUpdates.load()); + operationsBlockedByRefreshBuilder.append("countDeletes", + operationsBlockedByRefresh.countDeletes.load()); + operationsBlockedByRefreshBuilder.append("countCommands", + operationsBlockedByRefresh.countCommands.load()); + + operationsBlockedByRefreshBuilder.done(); + } } CachedDatabaseInfo::CachedDatabaseInfo(DatabaseType dbt, std::shared_ptr<Shard> primaryShard) |