SERVER-35732 Fix dbStats.fsUsedSize behavior for database with hyphenated names

4 files changed, 16 insertions, 0 deletions

diff --git a/src/mongo/db/storage/kv/kv_catalog.cpp b/src/mongo/db/storage/kv/kv_catalog.cpp
index 28736f8598e..b28f509e80a 100644
--- a/src/mongo/db/storage/kv/kv_catalog.cpp
+++ b/src/mongo/db/storage/kv/kv_catalog.cpp
@@ -347,6 +347,14 @@ std::string KVCatalog::newTempIdent() {
     return buf.str();
 }
 
+std::string KVCatalog::getFilesystemPathForDb(const std::string& dbName) const {
+    if (_directoryPerDb) {
+        return storageGlobalParams.dbpath + '/' + escapeDbName(dbName);
+    } else {
+        return storageGlobalParams.dbpath;
+    }
+}
+
 std::string KVCatalog::_newUniqueIdent(StringData ns, const char* kind) {
     // If this changes to not put _rand at the end, _hasEntryCollidingWithRand will need fixing.
     StringBuilder buf;
diff --git a/src/mongo/db/storage/kv/kv_catalog.h b/src/mongo/db/storage/kv/kv_catalog.h
index bc99e4e1e7c..fe670d3795a 100644
--- a/src/mongo/db/storage/kv/kv_catalog.h
+++ b/src/mongo/db/storage/kv/kv_catalog.h
@@ -113,6 +113,8 @@ public:
      */
     StatusWith<std::string> newOrphanedIdent(OperationContext* opCtx, std::string ident);
 
+    std::string getFilesystemPathForDb(const std::string& dbName) const;
+
     /**
      * Generate a temporary ident name.
      */
diff --git a/src/mongo/db/storage/kv/kv_storage_engine.cpp b/src/mongo/db/storage/kv/kv_storage_engine.cpp
index 7738d4eb160..11f4d4f125d 100644
--- a/src/mongo/db/storage/kv/kv_storage_engine.cpp
+++ b/src/mongo/db/storage/kv/kv_storage_engine.cpp
@@ -455,6 +455,10 @@ KVStorageEngine::reconcileCatalogAndIdents(OperationContext* opCtx) {
     return ret;
 }
 
+std::string KVStorageEngine::getFilesystemPathForDb(const std::string& dbName) const {
+    return _catalog->getFilesystemPathForDb(dbName);
+}
+
 void KVStorageEngine::cleanShutdown() {
     for (DBMap::const_iterator it = _dbs.begin(); it != _dbs.end(); ++it) {
         delete it->second;
diff --git a/src/mongo/db/storage/kv/kv_storage_engine.h b/src/mongo/db/storage/kv/kv_storage_engine.h
index 4da67bc631f..0b33e837e40 100644
--- a/src/mongo/db/storage/kv/kv_storage_engine.h
+++ b/src/mongo/db/storage/kv/kv_storage_engine.h
@@ -187,6 +187,8 @@ public:
     StatusWith<std::vector<StorageEngine::CollectionIndexNamePair>> reconcileCatalogAndIdents(
         OperationContext* opCtx) override;
 
+    std::string getFilesystemPathForDb(const std::string& dbName) const override;
+
     /**
      * When loading after an unclean shutdown, this performs cleanup on the KVCatalog and unsets the
      * startingAfterUncleanShutdown decoration on the global ServiceContext.