summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Caimano <ben.caimano@10gen.com>2020-08-27 15:55:18 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-08-27 20:50:25 +0000
commit291f925b64efaca3996392b584398f81fb5f6087 (patch)
tree2988214adf383be5220c72f7af272fd3d0d1e153
parent4406491b2b137984c2583db98068b7d18ea32171 (diff)
downloadmongo-291f925b64efaca3996392b584398f81fb5f6087.tar.gz
SERVER-50227 Convert OpMsg integration test to use ClockSource instead of TickSource
-rw-r--r--src/mongo/rpc/op_msg_integration_test.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mongo/rpc/op_msg_integration_test.cpp b/src/mongo/rpc/op_msg_integration_test.cpp
index 0b2b4de6c31..d1b7484548b 100644
--- a/src/mongo/rpc/op_msg_integration_test.cpp
+++ b/src/mongo/rpc/op_msg_integration_test.cpp
@@ -568,7 +568,7 @@ TEST(OpMsg, ServerHandlesExhaustIsMasterCorrectly) {
ASSERT(conn);
}
- auto tickSource = getGlobalServiceContext()->getTickSource();
+ auto clockSource = getGlobalServiceContext()->getPreciseClockSource();
// Issue an isMaster command without a topology version.
auto isMasterCmd = BSON("isMaster" << 1);
@@ -590,11 +590,11 @@ TEST(OpMsg, ServerHandlesExhaustIsMasterCorrectly) {
OpMsg::setFlag(&request, OpMsg::kExhaustSupported);
// Run isMaster command to initiate the exhaust stream.
- auto beforeExhaustCommand = tickSource->getTicks();
+ auto beforeExhaustCommand = clockSource->now();
ASSERT(conn->call(request, reply));
- auto afterFirstResponse = tickSource->getTicks();
+ auto afterFirstResponse = clockSource->now();
// Allow for clock skew when testing the response time.
- ASSERT_GT(tickSource->ticksTo<Milliseconds>(afterFirstResponse - beforeExhaustCommand),
+ ASSERT_GT(duration_cast<Milliseconds>(afterFirstResponse - beforeExhaustCommand),
Milliseconds(50));
ASSERT(OpMsg::isFlagSet(reply, OpMsg::kMoreToCome));
res = OpMsg::parse(reply).body;
@@ -605,9 +605,9 @@ TEST(OpMsg, ServerHandlesExhaustIsMasterCorrectly) {
// Receive next exhaust message.
auto lastRequestId = reply.header().getId();
ASSERT_OK(conn->recv(reply, lastRequestId));
- auto afterSecondResponse = tickSource->getTicks();
+ auto afterSecondResponse = clockSource->now();
// Allow for clock skew when testing the response time.
- ASSERT_GT(tickSource->ticksTo<Milliseconds>(afterSecondResponse - afterFirstResponse),
+ ASSERT_GT(duration_cast<Milliseconds>(afterSecondResponse - afterFirstResponse),
Milliseconds(50));
ASSERT(OpMsg::isFlagSet(reply, OpMsg::kMoreToCome));
res = OpMsg::parse(reply).body;
@@ -631,7 +631,7 @@ TEST(OpMsg, ServerHandlesExhaustIsMasterWithTopologyChange) {
ASSERT(conn);
}
- auto tickSource = getGlobalServiceContext()->getTickSource();
+ auto clockSource = getGlobalServiceContext()->getPreciseClockSource();
// Issue an isMaster command without a topology version.
auto isMasterCmd = BSON("isMaster" << 1);
@@ -656,11 +656,11 @@ TEST(OpMsg, ServerHandlesExhaustIsMasterWithTopologyChange) {
// Run isMaster command to initiate the exhaust stream. The first response should be received
// immediately.
- auto beforeExhaustCommand = tickSource->getTicks();
+ auto beforeExhaustCommand = clockSource->now();
ASSERT(conn->call(request, reply));
- auto afterFirstResponse = tickSource->getTicks();
+ auto afterFirstResponse = clockSource->now();
// Allow for clock skew when testing the response time.
- ASSERT_LT(tickSource->ticksTo<Milliseconds>(afterFirstResponse - beforeExhaustCommand),
+ ASSERT_LT(duration_cast<Milliseconds>(afterFirstResponse - beforeExhaustCommand),
Milliseconds(50));
ASSERT(OpMsg::isFlagSet(reply, OpMsg::kMoreToCome));
res = OpMsg::parse(reply).body;
@@ -671,9 +671,9 @@ TEST(OpMsg, ServerHandlesExhaustIsMasterWithTopologyChange) {
// Receive next exhaust message. The second response waits for 'maxAwaitTimeMS'.
auto lastRequestId = reply.header().getId();
ASSERT_OK(conn->recv(reply, lastRequestId));
- auto afterSecondResponse = tickSource->getTicks();
+ auto afterSecondResponse = clockSource->now();
// Allow for clock skew when testing the response time.
- ASSERT_GT(tickSource->ticksTo<Milliseconds>(afterSecondResponse - afterFirstResponse),
+ ASSERT_GT(duration_cast<Milliseconds>(afterSecondResponse - afterFirstResponse),
Milliseconds(50));
ASSERT(OpMsg::isFlagSet(reply, OpMsg::kMoreToCome));
res = OpMsg::parse(reply).body;