SERVER-43074: Make appendMultikeyPathsAsBytes threadsafe.

The method previously relied on catalog level serialization for guaranteeing
serialized access to a global variable.

(cherry picked from commit eb47871d19c81d08827f83df0554ce2c83cd8487)

1 files changed, 2 insertions, 1 deletions

diff --git a/src/mongo/db/storage/bson_collection_catalog_entry.cpp b/src/mongo/db/storage/bson_collection_catalog_entry.cpp
index d5ea5ae8249..39536e14f4d 100644
--- a/src/mongo/db/storage/bson_collection_catalog_entry.cpp
+++ b/src/mongo/db/storage/bson_collection_catalog_entry.cpp
@@ -45,7 +45,6 @@ namespace {
 // We use that value to represent the largest number of path components we could ever possibly
 // expect to see in an indexed field.
 const size_t kMaxKeyPatternPathLength = 2048;
-char multikeyPathsEncodedAsBytes[kMaxKeyPatternPathLength];
 
 /**
  * Encodes 'multikeyPaths' as binary data and appends it to 'bob'.
@@ -57,6 +56,8 @@ char multikeyPathsEncodedAsBytes[kMaxKeyPatternPathLength];
 void appendMultikeyPathsAsBytes(BSONObj keyPattern,
                                 const MultikeyPaths& multikeyPaths,
                                 BSONObjBuilder* bob) {
+    char multikeyPathsEncodedAsBytes[kMaxKeyPatternPathLength];
+
     size_t i = 0;
     for (const auto keyElem : keyPattern) {
         StringData keyName = keyElem.fieldNameStringData();