diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/mongo/db/repl/repl_set_request_votes_args.cpp | 12 | ||||
-rw-r--r-- | src/mongo/db/repl/repl_set_request_votes_args.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mongo/db/repl/repl_set_request_votes_args.cpp b/src/mongo/db/repl/repl_set_request_votes_args.cpp index ee132d999d1..413fbcf0b4d 100644 --- a/src/mongo/db/repl/repl_set_request_votes_args.cpp +++ b/src/mongo/db/repl/repl_set_request_votes_args.cpp @@ -83,14 +83,14 @@ Status ReplSetRequestVotesArgs::initialize(const BSONObj& argsObj) { if (!status.isOK()) return status; - status = bsonExtractIntegerField(argsObj, kConfigVersionFieldName, &_cfgver); + status = bsonExtractIntegerField(argsObj, kConfigVersionFieldName, &_cfgVer); if (!status.isOK()) return status; // In order to be compatible with FCV 4.2, default the config term to -1 if we are unable // parse a configTerm field from the args. status = bsonExtractIntegerFieldWithDefault( - argsObj, kConfigTermFieldName, OpTime::kUninitializedTerm, &_cfgterm); + argsObj, kConfigTermFieldName, OpTime::kUninitializedTerm, &_cfgTerm); if (!status.isOK()) return status; @@ -122,11 +122,11 @@ long long ReplSetRequestVotesArgs::getCandidateIndex() const { } long long ReplSetRequestVotesArgs::getConfigVersion() const { - return _cfgver; + return _cfgVer; } long long ReplSetRequestVotesArgs::getConfigTerm() const { - return _cfgterm; + return _cfgTerm; } OpTime ReplSetRequestVotesArgs::getLastDurableOpTime() const { @@ -143,8 +143,8 @@ void ReplSetRequestVotesArgs::addToBSON(BSONObjBuilder* builder) const { builder->append(kDryRunFieldName, _dryRun); builder->append(kTermFieldName, _term); builder->appendIntOrLL(kCandidateIndexFieldName, _candidateIndex); - builder->appendIntOrLL(kConfigVersionFieldName, _cfgver); - builder->appendIntOrLL(kConfigTermFieldName, _cfgterm); + builder->appendIntOrLL(kConfigVersionFieldName, _cfgVer); + builder->appendIntOrLL(kConfigTermFieldName, _cfgTerm); _lastDurableOpTime.append(builder, kLastDurableOpTimeFieldName); } diff --git a/src/mongo/db/repl/repl_set_request_votes_args.h b/src/mongo/db/repl/repl_set_request_votes_args.h index 1dc74eb4f12..f17f25a3bbd 100644 --- a/src/mongo/db/repl/repl_set_request_votes_args.h +++ b/src/mongo/db/repl/repl_set_request_votes_args.h @@ -59,9 +59,9 @@ private: long long _term = -1; // Current known term of the command issuer. // replSet config index of the member who sent the replSetRequestVotesCmd. long long _candidateIndex = -1; - long long _cfgver = -1; // replSet config version known to the command issuer. + long long _cfgVer = -1; // replSet config version known to the command issuer. // replSet config term known to the command issuer. - long long _cfgterm = OpTime::kUninitializedTerm; + long long _cfgTerm = OpTime::kUninitializedTerm; OpTime _lastDurableOpTime; // The last known durable op of the command issuer. bool _dryRun = false; // Indicates this is a pre-election check when true. }; |