1 files changed, 22 insertions, 22 deletions

diff --git a/src/mongo/db/operation_context_test.cpp b/src/mongo/db/operation_context_test.cpp
index d7d538455d2..e06c084101a 100644
--- a/src/mongo/db/operation_context_test.cpp
+++ b/src/mongo/db/operation_context_test.cpp
@@ -257,11 +257,11 @@ TEST(OperationContextTest, setIsExecutingShutdownWorks) {
     ASSERT_OK(opCtx->getKillStatus());
 }
 
-TEST(OperationContextTest, CancelationTokenIsCanceledWhenMarkKilledIsCalled) {
+TEST(OperationContextTest, CancellationTokenIsCanceledWhenMarkKilledIsCalled) {
     auto serviceCtx = ServiceContext::make();
     auto client = serviceCtx->makeClient("OperationContextTest");
     auto opCtx = client->makeOperationContext();
-    auto cancelToken = opCtx->getCancelationToken();
+    auto cancelToken = opCtx->getCancellationToken();
 
     // Should not be canceled yet.
     ASSERT_FALSE(cancelToken.isCanceled());
@@ -272,11 +272,11 @@ TEST(OperationContextTest, CancelationTokenIsCanceledWhenMarkKilledIsCalled) {
     ASSERT_TRUE(cancelToken.isCanceled());
 }
 
-TEST(OperationContextTest, CancelationTokenIsCancelableAtFirst) {
+TEST(OperationContextTest, CancellationTokenIsCancelableAtFirst) {
     auto serviceCtx = ServiceContext::make();
     auto client = serviceCtx->makeClient("OperationContextTest");
     auto opCtx = client->makeOperationContext();
-    auto cancelToken = opCtx->getCancelationToken();
+    auto cancelToken = opCtx->getCancellationToken();
     ASSERT_TRUE(cancelToken.isCancelable());
 }
 
@@ -329,12 +329,12 @@ TEST_F(OperationDeadlineTests, OperationDeadlineExpiration) {
     ASSERT_EQ(ErrorCodes::ExceededTimeLimit, opCtx->checkForInterruptNoAssert());
 }
 
-TEST_F(OperationDeadlineTests, CancelationTokenIsCanceledAfterDeadlineExpires) {
+TEST_F(OperationDeadlineTests, CancellationTokenIsCanceledAfterDeadlineExpires) {
     auto opCtx = client->makeOperationContext();
     const Seconds timeout{1};
     opCtx->setDeadlineAfterNowBy(timeout, ErrorCodes::ExceededTimeLimit);
 
-    auto cancelToken = opCtx->getCancelationToken();
+    auto cancelToken = opCtx->getCancellationToken();
 
     // Should not be canceled yet.
     ASSERT_FALSE(cancelToken.isCanceled());
@@ -343,7 +343,7 @@ TEST_F(OperationDeadlineTests, CancelationTokenIsCanceledAfterDeadlineExpires) {
     mockClock->advance(timeout * 2);
 
     // This is required for the OperationContext to realize that the timeout has passed and mark
-    // itself killed, which is what triggers cancelation.
+    // itself killed, which is what triggers cancellation.
     ASSERT_EQ(ErrorCodes::ExceededTimeLimit, opCtx->checkForInterruptNoAssert());
 
     // Should be canceled now.
@@ -351,12 +351,12 @@ TEST_F(OperationDeadlineTests, CancelationTokenIsCanceledAfterDeadlineExpires) {
 }
 
 TEST_F(OperationDeadlineTests,
-       WaitingOnAFutureWithAnOperationContextThatHasCancelationCallbacksDoesNotDeadlock) {
+       WaitingOnAFutureWithAnOperationContextThatHasCancellationCallbacksDoesNotDeadlock) {
     auto opCtx = client->makeOperationContext();
     const Seconds timeout{1};
     opCtx->setDeadlineAfterNowBy(timeout, ErrorCodes::ExceededTimeLimit);
 
-    auto cancelToken = opCtx->getCancelationToken();
+    auto cancelToken = opCtx->getCancellationToken();
 
     // Should not be canceled yet.
     ASSERT_FALSE(cancelToken.isCanceled());
@@ -364,7 +364,7 @@ TEST_F(OperationDeadlineTests,
     // Advance past the timeout.
     mockClock->advance(timeout * 2);
 
-    // Chain a callback to the token. This will mean that calling cancel() on the CancelationSource
+    // Chain a callback to the token. This will mean that calling cancel() on the CancellationSource
     // will eventually have to acquire a mutex when fulfilling its SharedPromie.
     auto fut = cancelToken.onCancel().unsafeToInlineFuture().then([] {});
 
@@ -420,11 +420,11 @@ TEST_F(OperationDeadlineTests, WaitForMaxTimeExpiredCV) {
     auto m = MONGO_MAKE_LATCH();
     stdx::condition_variable cv;
     stdx::unique_lock<Latch> lk(m);
-    ASSERT_FALSE(opCtx->getCancelationToken().isCanceled());
+    ASSERT_FALSE(opCtx->getCancellationToken().isCanceled());
     ASSERT_THROWS_CODE(opCtx->waitForConditionOrInterrupt(cv, lk, [] { return false; }),
                        DBException,
                        ErrorCodes::ExceededTimeLimit);
-    ASSERT_TRUE(opCtx->getCancelationToken().isCanceled());
+    ASSERT_TRUE(opCtx->getCancellationToken().isCanceled());
 }
 
 TEST_F(OperationDeadlineTests, WaitForMaxTimeExpiredCVWithWaitUntilSet) {
@@ -433,12 +433,12 @@ TEST_F(OperationDeadlineTests, WaitForMaxTimeExpiredCVWithWaitUntilSet) {
     auto m = MONGO_MAKE_LATCH();
     stdx::condition_variable cv;
     stdx::unique_lock<Latch> lk(m);
-    ASSERT_FALSE(opCtx->getCancelationToken().isCanceled());
+    ASSERT_FALSE(opCtx->getCancellationToken().isCanceled());
     ASSERT_THROWS_CODE(opCtx->waitForConditionOrInterruptUntil(
                            cv, lk, mockClock->now() + Seconds{10}, [] { return false; }),
                        DBException,
                        ErrorCodes::ExceededTimeLimit);
-    ASSERT_TRUE(opCtx->getCancelationToken().isCanceled());
+    ASSERT_TRUE(opCtx->getCancellationToken().isCanceled());
 }
 
 TEST_F(OperationDeadlineTests, NestedTimeoutsTimeoutInOrder) {
@@ -729,12 +729,12 @@ TEST_F(OperationDeadlineTests, DuringWaitMaxTimeExpirationDominatesUntilExpirati
     auto m = MONGO_MAKE_LATCH();
     stdx::condition_variable cv;
     stdx::unique_lock<Latch> lk(m);
-    ASSERT_FALSE(opCtx->getCancelationToken().isCanceled());
+    ASSERT_FALSE(opCtx->getCancellationToken().isCanceled());
     ASSERT_THROWS_CODE(
         opCtx->waitForConditionOrInterruptUntil(cv, lk, mockClock->now(), [] { return false; }),
         DBException,
         ErrorCodes::ExceededTimeLimit);
-    ASSERT_TRUE(opCtx->getCancelationToken().isCanceled());
+    ASSERT_TRUE(opCtx->getCancellationToken().isCanceled());
 }
 
 class ThreadedOperationDeadlineTests : public OperationDeadlineTests {
@@ -862,13 +862,13 @@ TEST_F(ThreadedOperationDeadlineTests, KillArrivesWhileWaiting) {
     auto waiterResult = startWaiter(opCtx.get(), &state);
     ASSERT(stdx::future_status::ready !=
            waiterResult.wait_for(Milliseconds::zero().toSystemDuration()));
-    ASSERT_FALSE(opCtx->getCancelationToken().isCanceled());
+    ASSERT_FALSE(opCtx->getCancellationToken().isCanceled());
     {
         stdx::lock_guard<Client> clientLock(*opCtx->getClient());
         opCtx->markKilled();
     }
     ASSERT_THROWS_CODE(waiterResult.get(), DBException, ErrorCodes::Interrupted);
-    ASSERT_TRUE(opCtx->getCancelationToken().isCanceled());
+    ASSERT_TRUE(opCtx->getCancellationToken().isCanceled());
 }
 
 TEST_F(ThreadedOperationDeadlineTests, MaxTimeExpiresWhileWaiting) {
@@ -885,10 +885,10 @@ TEST_F(ThreadedOperationDeadlineTests, MaxTimeExpiresWhileWaiting) {
     mockClock->advance(Seconds{9});
     ASSERT(stdx::future_status::ready !=
            waiterResult.wait_for(Milliseconds::zero().toSystemDuration()));
-    ASSERT_FALSE(opCtx->getCancelationToken().isCanceled());
+    ASSERT_FALSE(opCtx->getCancellationToken().isCanceled());
     mockClock->advance(Seconds{2});
     ASSERT_THROWS_CODE(waiterResult.get(), DBException, ErrorCodes::ExceededTimeLimit);
-    ASSERT_TRUE(opCtx->getCancelationToken().isCanceled());
+    ASSERT_TRUE(opCtx->getCancellationToken().isCanceled());
 }
 
 TEST_F(ThreadedOperationDeadlineTests, UntilExpiresWhileWaiting) {
@@ -1061,7 +1061,7 @@ TEST(OperationContextTest, TestWaitForConditionOrInterruptUntilAPI) {
     Date_t deadline = Date_t::now() + Milliseconds(500);
     ASSERT_EQ(opCtx->waitForConditionOrInterruptUntil(cv, lk, deadline, [] { return false; }),
               false);
-    ASSERT_FALSE(opCtx->getCancelationToken().isCanceled());
+    ASSERT_FALSE(opCtx->getCancellationToken().isCanceled());
 
     // Case (3). Expect an error of `MaxTimeMSExpired`.
     opCtx->setDeadlineByDate(Date_t::now(), ErrorCodes::MaxTimeMSExpired);
@@ -1070,7 +1070,7 @@ TEST(OperationContextTest, TestWaitForConditionOrInterruptUntilAPI) {
         opCtx->waitForConditionOrInterruptUntil(cv, lk, deadline, [] { return false; }),
         DBException,
         ErrorCodes::MaxTimeMSExpired);
-    ASSERT_TRUE(opCtx->getCancelationToken().isCanceled());
+    ASSERT_TRUE(opCtx->getCancellationToken().isCanceled());
 }
 
 TEST(OperationContextTest, TestIsWaitingForConditionOrInterrupt) {