diff options
| author | William Schultz <william.schultz@mongodb.com> | 2020-02-28 13:08:04 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-02-28 18:27:38 +0000 |
| commit | 6b91a10befe35d4745f573542ed1dcb7da82adbb (patch) | |
| tree | 500a225343c91bfdaa26e76cf7d99a5a8cbbf1ff | |
| parent | f5e1ac9ee73195754bc39f103c3817d917e9da11 (diff) | |
| download | mongo-6b91a10befe35d4745f573542ed1dcb7da82adbb.tar.gz | |
SERVER-46470 Rename 't' field to 'configTerm' in replica set heartbeat responses
| -rw-r--r-- | src/mongo/db/repl/repl_set_heartbeat_response.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/db/repl/repl_set_heartbeat_response_test.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/db/repl/repl_set_heartbeat_response.cpp b/src/mongo/db/repl/repl_set_heartbeat_response.cpp index 5c547211d03..2f5f52e2ace 100644 --- a/src/mongo/db/repl/repl_set_heartbeat_response.cpp +++ b/src/mongo/db/repl/repl_set_heartbeat_response.cpp @@ -50,7 +50,7 @@ namespace { const std::string kConfigFieldName = "config"; const std::string kConfigVersionFieldName = "v"; -const std::string kConfigTermFieldName = "t"; +const std::string kConfigTermFieldName = "configTerm"; const std::string kElectionTimeFieldName = "electionTime"; const std::string kMemberStateFieldName = "state"; const std::string kOkFieldName = "ok"; @@ -80,6 +80,8 @@ void ReplSetHeartbeatResponse::addToBSON(BSONObjBuilder* builder) const { } if (_configVersion != -1) { *builder << kConfigVersionFieldName << _configVersion; + } + if (_configTerm != OpTime::kUninitializedTerm) { *builder << kConfigTermFieldName << _configTerm; } if (!_setName.empty()) { diff --git a/src/mongo/db/repl/repl_set_heartbeat_response_test.cpp b/src/mongo/db/repl/repl_set_heartbeat_response_test.cpp index 774dd13c76b..3851ebda892 100644 --- a/src/mongo/db/repl/repl_set_heartbeat_response_test.cpp +++ b/src/mongo/db/repl/repl_set_heartbeat_response_test.cpp @@ -116,7 +116,7 @@ TEST(ReplSetHeartbeatResponse, DefaultConstructThenSlowlyBuildToFullObj) { ASSERT_EQUALS(fieldsSet, hbResponseObj.nFields()); ASSERT_EQUALS("rs0", hbResponseObj["set"].String()); ASSERT_EQUALS(1, hbResponseObj["v"].Number()); - ASSERT_EQUALS(1, hbResponseObj["t"].Number()); + ASSERT_EQUALS(1, hbResponseObj["configTerm"].Number()); ASSERT_EQUALS(Timestamp(10, 0), hbResponseObj["electionTime"].timestamp()); ASSERT_EQUALS(Timestamp(0, 50), hbResponseObj["opTime"]["ts"].timestamp()); ASSERT_EQUALS(Timestamp(0, 10), hbResponseObj["durableOpTime"]["ts"].timestamp()); |