diff options
author | Louis Williams <louis.williams@mongodb.com> | 2017-09-28 16:40:49 -0400 |
---|---|---|
committer | Louis Williams <louis.williams@mongodb.com> | 2017-09-28 16:40:49 -0400 |
commit | 0309fa8091bdf7d6663a02fefd5d61ae0965e7b1 (patch) | |
tree | 685732dc627d5a2ea75f69a3c965388f82137a6a /src/mongo/db/server_options.h | |
parent | 20a128d3922a3f83f3769ee80ebb4fd607251888 (diff) | |
download | mongo-0309fa8091bdf7d6663a02fefd5d61ae0965e7b1.tar.gz |
Revert "SERVER-31209 Persist targetVersion in FCV document to indicate an upgrade/downgrade in progress."
This reverts commit b0b99866781302ba8b16de033ff2681f20483c14.
Diffstat (limited to 'src/mongo/db/server_options.h')
-rw-r--r-- | src/mongo/db/server_options.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/mongo/db/server_options.h b/src/mongo/db/server_options.h index 23f8bddff4f..a82d20acc79 100644 --- a/src/mongo/db/server_options.h +++ b/src/mongo/db/server_options.h @@ -158,22 +158,14 @@ struct ServerGlobalParams { * 3.4 node can participate in a cluster whose feature compatibility version is 3.6. */ k36, - /** - * This is only used for targetVersion to indicate that no upgrade is in progress. - */ - kUnset }; // Read-only parameter featureCompatibilityVersion. AtomicWord<Version> version{Version::k34}; - // If set, an upgrade or downgrade is in progress to the set version. - AtomicWord<Version> targetVersion{Version::kUnset}; - - // This determines whether to give Collections UUIDs upon creation. - bool isSchemaVersion36() { - return (version.load() == Version::k36 || targetVersion.load() == Version::k36); - } + // Read-only global isSchemaVersion36. This determines whether to give Collections UUIDs + // upon creation. + AtomicWord<bool> isSchemaVersion36{false}; // Feature validation differs depending on the role of a mongod in a replica set or // master/slave configuration. Masters/primaries can accept user-initiated writes and |