diff options
| author | Misha Tyulenev <misha@mongodb.com> | 2018-05-09 19:14:56 -0400 |
|---|---|---|
| committer | Misha Tyulenev <misha@mongodb.com> | 2018-05-09 19:15:19 -0400 |
| commit | 8d736eabdbc0da2d4846edffad26df538a6adad4 (patch) | |
| tree | 9c5a129703a5f9c7287575138f8a5869c1d29a3d /src/mongo/db/s | |
| parent | 37f979110019e7948cd82cd8c6084138d5dd8e61 (diff) | |
| download | mongo-8d736eabdbc0da2d4846edffad26df538a6adad4.tar.gz | |
SERVER-34683 drop config.system.sessions on downgrade to 3.4
Diffstat (limited to 'src/mongo/db/s')
| -rw-r--r-- | src/mongo/db/s/SConscript | 4 | ||||
| -rw-r--r-- | src/mongo/db/s/config/configsvr_shard_collection_command.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript index 449edaf2677..d1816c7d94d 100644 --- a/src/mongo/db/s/SConscript +++ b/src/mongo/db/s/SConscript @@ -190,7 +190,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/bson/dotted_path_support', - '$BUILD_DIR/mongo/db/commands/dcommands_fcv', + '$BUILD_DIR/mongo/db/commands/feature_compatibility_version', '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/dbhelpers', @@ -305,7 +305,7 @@ env.Library( LIBDEPS=[ '$BUILD_DIR/mongo/db/bson/dotted_path_support', '$BUILD_DIR/mongo/db/catalog/catalog_raii', - '$BUILD_DIR/mongo/db/commands/dcommands_fcv', + '$BUILD_DIR/mongo/db/commands/feature_compatibility_version', '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/dbhelpers', '$BUILD_DIR/mongo/db/index_d', diff --git a/src/mongo/db/s/config/configsvr_shard_collection_command.cpp b/src/mongo/db/s/config/configsvr_shard_collection_command.cpp index 1426e84117b..b38e680a384 100644 --- a/src/mongo/db/s/config/configsvr_shard_collection_command.cpp +++ b/src/mongo/db/s/config/configsvr_shard_collection_command.cpp @@ -736,7 +736,7 @@ public: // Do not allow sharding collections while a featureCompatibilityVersion upgrade or // downgrade is in progress (see SERVER-31231 for details). - Lock::ExclusiveLock lk(opCtx->lockState(), FeatureCompatibilityVersion::fcvLock); + Lock::SharedLock lk(opCtx->lockState(), FeatureCompatibilityVersion::fcvLock); const NamespaceString nss(parseNs(dbname, cmdObj)); auto request = ConfigsvrShardCollectionRequest::parse( |