SERVER-34364 replace references to invariantOK with invariant

42 files changed, 85 insertions, 85 deletions

diff --git a/src/mongo/db/auth/action_set.cpp b/src/mongo/db/auth/action_set.cpp
index d20fc022e2e..778e6f2e83d 100644
--- a/src/mongo/db/auth/action_set.cpp
+++ b/src/mongo/db/auth/action_set.cpp
@@ -97,7 +97,7 @@ Status ActionSet::parseActionSetFromString(const std::string& actionsString, Act
     splitStringDelim(actionsString, &actionsList, ',');
     std::vector<std::string> unrecognizedActions;
     Status status = parseActionSetFromStringVector(actionsList, result, &unrecognizedActions);
-    invariantOK(status);
+    invariant(status);
     if (unrecognizedActions.empty()) {
         return Status::OK();
     }
@@ -118,7 +118,7 @@ Status ActionSet::parseActionSetFromStringVector(const std::vector<std::string>&
         if (status == ErrorCodes::FailedToParse) {
             unrecognizedActions->push_back(actionsVector[i]);
         } else {
-            invariantOK(status);
+            invariant(status);
             if (action == ActionType::anyAction) {
                 result->addAllActions();
                 return Status::OK();
diff --git a/src/mongo/db/catalog/coll_mod.cpp b/src/mongo/db/catalog/coll_mod.cpp
index 35a082819fd..a40e08bab4a 100644
--- a/src/mongo/db/catalog/coll_mod.cpp
+++ b/src/mongo/db/catalog/coll_mod.cpp
@@ -410,11 +410,11 @@ Status _collModInternal(OperationContext* opCtx,
 
     // The Validator, ValidationAction and ValidationLevel are already parsed and must be OK.
     if (!cmr.collValidator.eoo())
-        invariantOK(coll->setValidator(opCtx, cmr.collValidator.Obj()));
+        invariant(coll->setValidator(opCtx, cmr.collValidator.Obj()));
     if (!cmr.collValidationAction.empty())
-        invariantOK(coll->setValidationAction(opCtx, cmr.collValidationAction));
+        invariant(coll->setValidationAction(opCtx, cmr.collValidationAction));
     if (!cmr.collValidationLevel.empty())
-        invariantOK(coll->setValidationLevel(opCtx, cmr.collValidationLevel));
+        invariant(coll->setValidationLevel(opCtx, cmr.collValidationLevel));
 
     // UsePowerof2Sizes
     if (!cmr.usePowerOf2Sizes.eoo())
diff --git a/src/mongo/db/catalog/collection_impl.cpp b/src/mongo/db/catalog/collection_impl.cpp
index 77eae4b05b9..74909e46f0c 100644
--- a/src/mongo/db/catalog/collection_impl.cpp
+++ b/src/mongo/db/catalog/collection_impl.cpp
@@ -129,7 +129,7 @@ std::unique_ptr<CollatorInterface> parseCollation(OperationContext* opCtx,
               << collationSpec;
         fassertFailedNoTrace(40144);
     }
-    invariantOK(collator.getStatus());
+    invariant(collator.getStatus());
 
     return std::move(collator.getValue());
 }
diff --git a/src/mongo/db/catalog/index_catalog_entry_impl.cpp b/src/mongo/db/catalog/index_catalog_entry_impl.cpp
index 87d68175364..5e717b97e71 100644
--- a/src/mongo/db/catalog/index_catalog_entry_impl.cpp
+++ b/src/mongo/db/catalog/index_catalog_entry_impl.cpp
@@ -120,7 +120,7 @@ IndexCatalogEntryImpl::IndexCatalogEntryImpl(IndexCatalogEntry* const this_,
             CollatorFactoryInterface::get(opCtx->getServiceContext())->makeFromBSON(collation);
 
         // Index spec should have already been validated.
-        invariantOK(statusWithCollator.getStatus());
+        invariant(statusWithCollator.getStatus());
 
         _collator = std::move(statusWithCollator.getValue());
     }
@@ -138,7 +138,7 @@ IndexCatalogEntryImpl::IndexCatalogEntryImpl(IndexCatalogEntry* const this_,
                                          std::move(expCtx),
                                          ExtensionsCallbackNoop(),
                                          MatchExpressionParser::kBanAllSpecialFeatures);
-        invariantOK(statusWithMatcher.getStatus());
+        invariant(statusWithMatcher.getStatus());
         _filterExpression = std::move(statusWithMatcher.getValue());
         LOG(2) << "have filter expression for " << _ns << " " << _descriptor->indexName() << " "
                << redact(filter);
diff --git a/src/mongo/db/commands/create_indexes.cpp b/src/mongo/db/commands/create_indexes.cpp
index ed8a46d20bf..eb3b197278f 100644
--- a/src/mongo/db/commands/create_indexes.cpp
+++ b/src/mongo/db/commands/create_indexes.cpp
@@ -182,7 +182,7 @@ StatusWith<std::vector<BSONObj>> resolveCollectionDefaultProperties(
                                           ->makeFromBSON(collationElem.Obj());
                 // validateIndexSpecCollation() should have checked that the index collation spec is
                 // valid.
-                invariantOK(collatorStatus.getStatus());
+                invariant(collatorStatus.getStatus());
                 indexCollator = std::move(collatorStatus.getValue());
             }
             if (!CollatorInterface::collatorsMatch(collection->getDefaultCollator(),
diff --git a/src/mongo/db/commands/index_filter_commands.cpp b/src/mongo/db/commands/index_filter_commands.cpp
index 75bc78be617..203152d5fec 100644
--- a/src/mongo/db/commands/index_filter_commands.cpp
+++ b/src/mongo/db/commands/index_filter_commands.cpp
@@ -313,7 +313,7 @@ Status ClearFilters::clear(OperationContext* opCtx,
                                          expCtx,
                                          extensionsCallback,
                                          MatchExpressionParser::kAllowAllSpecialFeatures);
-        invariantOK(statusWithCQ.getStatus());
+        invariant(statusWithCQ.getStatus());
         std::unique_ptr<CanonicalQuery> cq = std::move(statusWithCQ.getValue());
 
         // Remove plan cache entry.
diff --git a/src/mongo/db/matcher/expression_text_noop.cpp b/src/mongo/db/matcher/expression_text_noop.cpp
index a42845d4e63..255a44a6278 100644
--- a/src/mongo/db/matcher/expression_text_noop.cpp
+++ b/src/mongo/db/matcher/expression_text_noop.cpp
@@ -40,7 +40,7 @@ TextNoOpMatchExpression::TextNoOpMatchExpression(TextParams params)
     _ftsQuery.setLanguage(std::move(params.language));
     _ftsQuery.setCaseSensitive(params.caseSensitive);
     _ftsQuery.setDiacriticSensitive(params.diacriticSensitive);
-    invariantOK(_ftsQuery.parse(fts::TEXT_INDEX_VERSION_INVALID));
+    invariant(_ftsQuery.parse(fts::TEXT_INDEX_VERSION_INVALID));
 }
 
 std::unique_ptr<MatchExpression> TextNoOpMatchExpression::shallowClone() const {
diff --git a/src/mongo/db/matcher/expression_with_placeholder.cpp b/src/mongo/db/matcher/expression_with_placeholder.cpp
index 5593d9ac4c5..85979bc4f12 100644
--- a/src/mongo/db/matcher/expression_with_placeholder.cpp
+++ b/src/mongo/db/matcher/expression_with_placeholder.cpp
@@ -118,7 +118,7 @@ void ExpressionWithPlaceholder::optimizeFilter() {
     _filter = MatchExpression::optimize(std::move(_filter));
 
     auto newPlaceholder = parseTopLevelFieldName(_filter.get());
-    invariantOK(newPlaceholder.getStatus());
+    invariant(newPlaceholder.getStatus());
 
     if (newPlaceholder.getValue()) {
         _placeholder = newPlaceholder.getValue()->toString();
diff --git a/src/mongo/db/matcher/extensions_callback.cpp b/src/mongo/db/matcher/extensions_callback.cpp
index 197e5d473c1..861608bd134 100644
--- a/src/mongo/db/matcher/extensions_callback.cpp
+++ b/src/mongo/db/matcher/extensions_callback.cpp
@@ -63,7 +63,7 @@ ExtensionsCallback::extractTextMatchExpressionParams(BSONElement text) {
     } else if (languageStatus == ErrorCodes::NoSuchKey) {
         params.language = std::string();
     } else {
-        invariantOK(languageStatus);
+        invariant(languageStatus);
         expectedFieldCount++;
     }
 
@@ -74,7 +74,7 @@ ExtensionsCallback::extractTextMatchExpressionParams(BSONElement text) {
     } else if (caseSensitiveStatus == ErrorCodes::NoSuchKey) {
         params.caseSensitive = TextMatchExpressionBase::kCaseSensitiveDefault;
     } else {
-        invariantOK(caseSensitiveStatus);
+        invariant(caseSensitiveStatus);
         expectedFieldCount++;
     }
 
@@ -85,7 +85,7 @@ ExtensionsCallback::extractTextMatchExpressionParams(BSONElement text) {
     } else if (diacriticSensitiveStatus == ErrorCodes::NoSuchKey) {
         params.diacriticSensitive = TextMatchExpressionBase::kDiacriticSensitiveDefault;
     } else {
-        invariantOK(diacriticSensitiveStatus);
+        invariant(diacriticSensitiveStatus);
         expectedFieldCount++;
     }
 
diff --git a/src/mongo/db/query/internal_plans.cpp b/src/mongo/db/query/internal_plans.cpp
index b47a4ce627d..0a3aeddfc56 100644
--- a/src/mongo/db/query/internal_plans.cpp
+++ b/src/mongo/db/query/internal_plans.cpp
@@ -88,7 +88,7 @@ std::unique_ptr<PlanExecutor, PlanExecutor::Deleter> InternalPlanner::deleteWith
 
     auto executor =
         PlanExecutor::make(opCtx, std::move(ws), std::move(root), collection, yieldPolicy);
-    invariantOK(executor.getStatus());
+    invariant(executor.getStatus());
     return std::move(executor.getValue());
 }
 
@@ -117,7 +117,7 @@ std::unique_ptr<PlanExecutor, PlanExecutor::Deleter> InternalPlanner::indexScan(
 
     auto executor =
         PlanExecutor::make(opCtx, std::move(ws), std::move(root), collection, yieldPolicy);
-    invariantOK(executor.getStatus());
+    invariant(executor.getStatus());
     return std::move(executor.getValue());
 }
 
@@ -147,7 +147,7 @@ std::unique_ptr<PlanExecutor, PlanExecutor::Deleter> InternalPlanner::deleteWith
 
     auto executor =
         PlanExecutor::make(opCtx, std::move(ws), std::move(root), collection, yieldPolicy);
-    invariantOK(executor.getStatus());
+    invariant(executor.getStatus());
     return std::move(executor.getValue());
 }
 
@@ -166,7 +166,7 @@ std::unique_ptr<PlanExecutor, PlanExecutor::Deleter> InternalPlanner::updateWith
 
     auto executor =
         PlanExecutor::make(opCtx, std::move(ws), std::move(root), collection, yieldPolicy);
-    invariantOK(executor.getStatus());
+    invariant(executor.getStatus());
     return std::move(executor.getValue());
 }
 
diff --git a/src/mongo/db/repl/oplog_applier.cpp b/src/mongo/db/repl/oplog_applier.cpp
index 5630be7baac..3f3c527795f 100644
--- a/src/mongo/db/repl/oplog_applier.cpp
+++ b/src/mongo/db/repl/oplog_applier.cpp
@@ -60,13 +60,13 @@ Future<void> OplogApplier::startup() {
     auto future = _promise.getFuture();
     auto callback =
         [ this, promise = _promise.share() ](const CallbackArgs& args) mutable noexcept {
-        invariantOK(args.status);
+        invariant(args.status);
         log() << "Starting oplog application";
         _syncTail->oplogApplication(_oplogBuffer, _replCoord);
         log() << "Finished oplog application";
         promise.setWith([] {});
     };
-    invariantOK(_executor->scheduleWork(callback).getStatus());
+    invariant(_executor->scheduleWork(callback).getStatus());
     return future;
 }
 
diff --git a/src/mongo/db/repl/replication_consistency_markers_impl.cpp b/src/mongo/db/repl/replication_consistency_markers_impl.cpp
index dedd034ee1c..8c21e344fdd 100644
--- a/src/mongo/db/repl/replication_consistency_markers_impl.cpp
+++ b/src/mongo/db/repl/replication_consistency_markers_impl.cpp
@@ -88,7 +88,7 @@ boost::optional<MinValidDocument> ReplicationConsistencyMarkersImpl::_getMinVali
 void ReplicationConsistencyMarkersImpl::_updateMinValidDocument(
     OperationContext* opCtx, const TimestampedBSONObj& updateSpec) {
     Status status = _storageInterface->putSingleton(opCtx, _minValidNss, updateSpec);
-    invariantOK(status);
+    invariant(status);
 }
 
 void ReplicationConsistencyMarkersImpl::initializeMinValidDocument(OperationContext* opCtx) {
@@ -234,7 +234,7 @@ void ReplicationConsistencyMarkersImpl::setMinValidToAtLeast(OperationContext* o
     update.timestamp = minValid.getTimestamp();
 
     Status status = _storageInterface->updateSingleton(opCtx, _minValidNss, query, update);
-    invariantOK(status);
+    invariant(status);
 }
 
 void ReplicationConsistencyMarkersImpl::removeOldOplogDeleteFromPointField(
diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp
index 6922a0f51ef..1ecb7e6fee2 100644
--- a/src/mongo/db/repl/replication_coordinator_impl.cpp
+++ b/src/mongo/db/repl/replication_coordinator_impl.cpp
@@ -657,7 +657,7 @@ void ReplicationCoordinatorImpl::_startDataReplication(OperationContext* opCtx,
         // ReplSetConfig has been installed, so it's either in STARTUP2 or REMOVED.
         auto memberState = getMemberState();
         invariant(memberState.startup2() || memberState.removed());
-        invariantOK(setFollowerMode(MemberState::RS_RECOVERING));
+        invariant(setFollowerMode(MemberState::RS_RECOVERING));
         _externalState->startSteadyStateReplication(opCtx, this);
         return;
     }
@@ -703,7 +703,7 @@ void ReplicationCoordinatorImpl::_startDataReplication(OperationContext* opCtx,
         // Because initial sync completed, we can only be in STARTUP2, not REMOVED.
         // Transition from STARTUP2 to RECOVERING and start the producer and the applier.
         invariant(getMemberState().startup2());
-        invariantOK(setFollowerMode(MemberState::RS_RECOVERING));
+        invariant(setFollowerMode(MemberState::RS_RECOVERING));
         _externalState->startSteadyStateReplication(opCtxHolder.get(), this);
     };
 
@@ -1004,7 +1004,7 @@ void ReplicationCoordinatorImpl::signalDrainComplete(OperationContext* opCtx,
             log() << "Transition to primary failed" << causedBy(status);
             return;
         }
-        invariantOK(status);
+        invariant(status);
     }
 
     // Must calculate the commit level again because firstOpTimeOfMyTerm wasn't set when we logged
diff --git a/src/mongo/db/repl/rollback_impl.cpp b/src/mongo/db/repl/rollback_impl.cpp
index 530e740c38f..e92b0c9ab2d 100644
--- a/src/mongo/db/repl/rollback_impl.cpp
+++ b/src/mongo/db/repl/rollback_impl.cpp
@@ -697,7 +697,7 @@ Timestamp RollbackImpl::_findTruncateTimestamp(
     // Check that we've found the right document for the common point.
     invariant(commonPointRecord);
     auto commonPointTime = OpTime::parseFromOplogEntry(commonPointRecord->data.releaseToBson());
-    invariantOK(commonPointTime.getStatus());
+    invariant(commonPointTime.getStatus());
     invariant(commonPointTime.getValue() == commonPointOpTime,
               str::stream() << "Common point: " << commonPointOpTime.toString()
                             << ", record found: "
@@ -707,7 +707,7 @@ Timestamp RollbackImpl::_findTruncateTimestamp(
     auto truncatePointRecord = oplogCursor->next();
     invariant(truncatePointRecord);
     auto truncatePointTime = OpTime::parseFromOplogEntry(truncatePointRecord->data.releaseToBson());
-    invariantOK(truncatePointTime.getStatus());
+    invariant(truncatePointTime.getStatus());
 
     log() << "Marking to truncate all oplog entries with timestamps greater than or equal to "
           << truncatePointTime.getValue();
diff --git a/src/mongo/db/repl/sync_tail.cpp b/src/mongo/db/repl/sync_tail.cpp
index f26011121aa..1dd997ce5a8 100644
--- a/src/mongo/db/repl/sync_tail.cpp
+++ b/src/mongo/db/repl/sync_tail.cpp
@@ -425,7 +425,7 @@ void prefetchOp(const OplogEntry& oplogEntry) {
 void prefetchOps(const MultiApplier::Operations& ops, ThreadPool* prefetcherPool) {
     invariant(prefetcherPool);
     for (auto&& op : ops) {
-        invariantOK(prefetcherPool->schedule([&] { prefetchOp(op); }));
+        invariant(prefetcherPool->schedule([&] { prefetchOp(op); }));
     }
     prefetcherPool->waitForIdle();
 }
@@ -441,7 +441,7 @@ void applyOps(std::vector<MultiApplier::OperationPtrs>& writerVectors,
     invariant(writerVectors.size() == statusVector->size());
     for (size_t i = 0; i < writerVectors.size(); i++) {
         if (!writerVectors[i].empty()) {
-            invariantOK(writerPool->schedule([
+            invariant(writerPool->schedule([
                 &func,
                 st,
                 &writer = writerVectors.at(i),
@@ -500,7 +500,7 @@ void scheduleWritesToOplog(OperationContext* opCtx,
     if (!enoughToMultiThread ||
         !opCtx->getServiceContext()->getGlobalStorageEngine()->supportsDocLocking()) {
 
-        invariantOK(threadPool->schedule(makeOplogWriterForRange(0, ops.size())));
+        invariant(threadPool->schedule(makeOplogWriterForRange(0, ops.size())));
         return;
     }
 
@@ -510,7 +510,7 @@ void scheduleWritesToOplog(OperationContext* opCtx,
     for (size_t thread = 0; thread < numOplogThreads; thread++) {
         size_t begin = thread * numOpsPerThread;
         size_t end = (thread == numOplogThreads - 1) ? ops.size() : begin + numOpsPerThread;
-        invariantOK(threadPool->schedule(makeOplogWriterForRange(begin, end)));
+        invariant(threadPool->schedule(makeOplogWriterForRange(begin, end)));
     }
 }
 
diff --git a/src/mongo/db/repl/task_runner.cpp b/src/mongo/db/repl/task_runner.cpp
index 8d08c21b746..0f1a467e9da 100644
--- a/src/mongo/db/repl/task_runner.cpp
+++ b/src/mongo/db/repl/task_runner.cpp
@@ -112,7 +112,7 @@ void TaskRunner::schedule(const Task& task) {
         return;
     }
 
-    invariantOK(_threadPool->schedule([this] { _runTasks(); }));
+    invariant(_threadPool->schedule([this] { _runTasks(); }));
 
     _active = true;
     _cancelRequested = false;
diff --git a/src/mongo/db/s/balancer/balancer_policy.cpp b/src/mongo/db/s/balancer/balancer_policy.cpp
index 7239f9b9e61..d85662685c4 100644
--- a/src/mongo/db/s/balancer/balancer_policy.cpp
+++ b/src/mongo/db/s/balancer/balancer_policy.cpp
@@ -532,7 +532,7 @@ string ZoneRange::toString() const {
 }
 
 MigrateInfo::MigrateInfo(const ShardId& a_to, const ChunkType& a_chunk) {
-    invariantOK(a_chunk.validate());
+    invariant(a_chunk.validate());
     invariant(a_to.isValid());
 
     to = a_to;
diff --git a/src/mongo/db/s/collection_range_deleter.cpp b/src/mongo/db/s/collection_range_deleter.cpp
index 9f90ed44e02..14aa772df4f 100644
--- a/src/mongo/db/s/collection_range_deleter.cpp
+++ b/src/mongo/db/s/collection_range_deleter.cpp
@@ -268,7 +268,7 @@ boost::optional<Date_t> CollectionRangeDeleter::cleanUpNextRange(
     }
 
     invariant(range);
-    invariantOK(wrote.getStatus());
+    invariant(wrote.getStatus());
     invariant(wrote.getValue() > 0);
 
     notification.abandon();
diff --git a/src/mongo/db/s/shard_filtering_metadata_refresh.cpp b/src/mongo/db/s/shard_filtering_metadata_refresh.cpp
index cc3e9533ecb..be2d5ad9db5 100644
--- a/src/mongo/db/s/shard_filtering_metadata_refresh.cpp
+++ b/src/mongo/db/s/shard_filtering_metadata_refresh.cpp
@@ -54,7 +54,7 @@ Status onShardVersionMismatch(OperationContext* opCtx,
     invariant(!opCtx->getClient()->isInDirectClient());
 
     auto const shardingState = ShardingState::get(opCtx);
-    invariantOK(shardingState->canAcceptShardedCommands());
+    invariant(shardingState->canAcceptShardedCommands());
 
     LOG(2) << "Metadata refresh requested for " << nss.ns() << " at shard version "
            << shardVersionReceived;
@@ -103,7 +103,7 @@ ChunkVersion forceShardFilteringMetadataRefresh(OperationContext* opCtx,
     invariant(!opCtx->getClient()->isInDirectClient());
 
     auto const shardingState = ShardingState::get(opCtx);
-    invariantOK(shardingState->canAcceptShardedCommands());
+    invariant(shardingState->canAcceptShardedCommands());
 
     const auto routingInfo = uassertStatusOK(
         Grid::get(opCtx)->catalogCache()->getCollectionRoutingInfoWithRefresh(opCtx, nss));
@@ -164,7 +164,7 @@ void onDbVersionMismatch(OperationContext* opCtx,
     invariant(!opCtx->getClient()->isInDirectClient());
 
     auto const shardingState = ShardingState::get(opCtx);
-    invariantOK(shardingState->canAcceptShardedCommands());
+    invariant(shardingState->canAcceptShardedCommands());
 
     if (serverDbVersion && serverDbVersion->getUuid() == clientDbVersion.getUuid() &&
         serverDbVersion->getLastMod() >= clientDbVersion.getLastMod()) {
@@ -195,7 +195,7 @@ void forceDatabaseRefresh(OperationContext* opCtx, const StringData dbName) {
     invariant(!opCtx->getClient()->isInDirectClient());
 
     auto const shardingState = ShardingState::get(opCtx);
-    invariantOK(shardingState->canAcceptShardedCommands());
+    invariant(shardingState->canAcceptShardedCommands());
 
     const auto refreshedDbVersion =
         uassertStatusOK(Grid::get(opCtx)->catalogCache()->getDatabaseWithRefresh(opCtx, dbName))
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
index 1b05fb124b6..bfa26ed8772 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
@@ -111,7 +111,7 @@ void WiredTigerUtil::fetchTypeAndSourceURI(OperationContext* opCtx,
     invariant(colon != string::npos);
     colgroupUri += tableUri.substr(colon);
     StatusWith<std::string> colgroupResult = getMetadata(opCtx, colgroupUri);
-    invariantOK(colgroupResult.getStatus());
+    invariant(colgroupResult.getStatus());
     WiredTigerConfigParser parser(colgroupResult.getValue());
 
     WT_CONFIG_ITEM typeItem;
@@ -227,7 +227,7 @@ StatusWith<int64_t> WiredTigerUtil::checkApplicationMetadataFormatVersion(Operat
     if (result.getStatus().code() == ErrorCodes::NoSuchKey) {
         return result.getStatus();
     }
-    invariantOK(result.getStatus());
+    invariant(result.getStatus());
 
     WiredTigerConfigParser topParser(result.getValue());
     WT_CONFIG_ITEM metadata;
diff --git a/src/mongo/db/ttl.cpp b/src/mongo/db/ttl.cpp
index fd08ff8a7d3..ee50be543fd 100644
--- a/src/mongo/db/ttl.cpp
+++ b/src/mongo/db/ttl.cpp
@@ -244,7 +244,7 @@ private:
         auto qr = stdx::make_unique<QueryRequest>(collectionNSS);
         qr->setFilter(query);
         auto canonicalQuery = CanonicalQuery::canonicalize(opCtx, std::move(qr));
-        invariantOK(canonicalQuery.getStatus());
+        invariant(canonicalQuery.getStatus());
 
         DeleteStageParams params;
         params.isMulti = true;
diff --git a/src/mongo/db/update/addtoset_node.cpp b/src/mongo/db/update/addtoset_node.cpp
index 89eb53f8bd6..e37362f0baa 100644
--- a/src/mongo/db/update/addtoset_node.cpp
+++ b/src/mongo/db/update/addtoset_node.cpp
@@ -134,7 +134,7 @@ ModifierNode::ModifyResult AddToSetNode::updateExistingElement(
 
     for (auto&& elem : elementsToAdd) {
         auto toAdd = element->getDocument().makeElement(elem);
-        invariantOK(element->pushBack(toAdd));
+        invariant(element->pushBack(toAdd));
     }
 
     return ModifyResult::kNormalUpdate;
@@ -142,10 +142,10 @@ ModifierNode::ModifyResult AddToSetNode::updateExistingElement(
 
 void AddToSetNode::setValueForNewElement(mutablebson::Element* element) const {
     BSONObj emptyArray;
-    invariantOK(element->setValueArray(emptyArray));
+    invariant(element->setValueArray(emptyArray));
     for (auto&& elem : _elements) {
         auto toAdd = element->getDocument().makeElement(elem);
-        invariantOK(element->pushBack(toAdd));
+        invariant(element->pushBack(toAdd));
     }
 }
 
diff --git a/src/mongo/db/update/arithmetic_node.cpp b/src/mongo/db/update/arithmetic_node.cpp
index ab46e854616..de057eef017 100644
--- a/src/mongo/db/update/arithmetic_node.cpp
+++ b/src/mongo/db/update/arithmetic_node.cpp
@@ -113,7 +113,7 @@ ModifierNode::ModifyResult ArithmeticNode::updateExistingElement(
                                 << (idElem.ok() ? idElem.toString() : "no id")
                                 << "}");
     } else {
-        invariantOK(element->setValueSafeNum(valueToSet));
+        invariant(element->setValueSafeNum(valueToSet));
         return ModifyResult::kNormalUpdate;
     }
 }
diff --git a/src/mongo/db/update/array_culling_node.cpp b/src/mongo/db/update/array_culling_node.cpp
index 41389cdbed9..40b033abcd8 100644
--- a/src/mongo/db/update/array_culling_node.cpp
+++ b/src/mongo/db/update/array_culling_node.cpp
@@ -46,7 +46,7 @@ ModifierNode::ModifyResult ArrayCullingNode::updateExistingElement(
         // the rightSibling pointer will be invalidated.
         auto nextElement = cursor.rightSibling();
         if (_matcher->match(cursor)) {
-            invariantOK(cursor.remove());
+            invariant(cursor.remove());
             numRemoved++;
         }
         cursor = nextElement;
diff --git a/src/mongo/db/update/bit_node.cpp b/src/mongo/db/update/bit_node.cpp
index c2ca50dae32..a9ad0531992 100644
--- a/src/mongo/db/update/bit_node.cpp
+++ b/src/mongo/db/update/bit_node.cpp
@@ -106,7 +106,7 @@ ModifierNode::ModifyResult BitNode::updateExistingElement(
     SafeNum value = applyOpList(element->getValueSafeNum());
 
     if (!value.isIdentical(element->getValueSafeNum())) {
-        invariantOK(element->setValueSafeNum(value));
+        invariant(element->setValueSafeNum(value));
         return ModifyResult::kNormalUpdate;
     } else {
         return ModifyResult::kNoOp;
@@ -115,7 +115,7 @@ ModifierNode::ModifyResult BitNode::updateExistingElement(
 
 void BitNode::setValueForNewElement(mutablebson::Element* element) const {
     SafeNum value = applyOpList(SafeNum(static_cast<int32_t>(0)));
-    invariantOK(element->setValueSafeNum(value));
+    invariant(element->setValueSafeNum(value));
 }
 
 SafeNum BitNode::applyOpList(SafeNum value) const {
diff --git a/src/mongo/db/update/compare_node.cpp b/src/mongo/db/update/compare_node.cpp
index fd4e1202a94..6aa9e9f5fee 100644
--- a/src/mongo/db/update/compare_node.cpp
+++ b/src/mongo/db/update/compare_node.cpp
@@ -53,13 +53,13 @@ ModifierNode::ModifyResult CompareNode::updateExistingElement(
     if ((compareVal == 0) || ((_mode == CompareMode::kMax) ? (compareVal > 0) : (compareVal < 0))) {
         return ModifyResult::kNoOp;
     } else {
-        invariantOK(element->setValueBSONElement(_val));
+        invariant(element->setValueBSONElement(_val));
         return ModifyResult::kNormalUpdate;
     }
 }
 
 void CompareNode::setValueForNewElement(mutablebson::Element* element) const {
-    invariantOK(element->setValueBSONElement(_val));
+    invariant(element->setValueBSONElement(_val));
 }
 
 }  // namespace mongo
diff --git a/src/mongo/db/update/current_date_node.cpp b/src/mongo/db/update/current_date_node.cpp
index 057ce2c1779..71b61f72484 100644
--- a/src/mongo/db/update/current_date_node.cpp
+++ b/src/mongo/db/update/current_date_node.cpp
@@ -43,9 +43,9 @@ constexpr StringData kTimestamp = "timestamp"_sd;
 
 void setValue(mutablebson::Element* element, bool typeIsDate) {
     if (typeIsDate) {
-        invariantOK(element->setValueDate(mongo::jsTime()));
+        invariant(element->setValueDate(mongo::jsTime()));
     } else {
-        invariantOK(element->setValueTimestamp(
+        invariant(element->setValueTimestamp(
             LogicalClock::get(getGlobalServiceContext())->reserveTicks(1).asTimestamp()));
     }
 }
diff --git a/src/mongo/db/update/object_replace_node.cpp b/src/mongo/db/update/object_replace_node.cpp
index 151db825dba..9926b0806a6 100644
--- a/src/mongo/db/update/object_replace_node.cpp
+++ b/src/mongo/db/update/object_replace_node.cpp
@@ -92,12 +92,12 @@ UpdateNode::ApplyResult ObjectReplaceNode::apply(ApplyParams applyParams) const
 
         auto toRemove = current;
         current = current.rightSibling();
-        invariantOK(toRemove.remove());
+        invariant(toRemove.remove());
     }
 
     // Insert the provided contents instead.
     for (auto&& elem : _val) {
-        invariantOK(applyParams.element.appendElement(elem));
+        invariant(applyParams.element.appendElement(elem));
     }
 
     // Validate for storage.
@@ -144,10 +144,10 @@ UpdateNode::ApplyResult ObjectReplaceNode::apply(ApplyParams applyParams) const
 
     if (applyParams.logBuilder) {
         auto replacementObject = applyParams.logBuilder->getDocument().end();
-        invariantOK(applyParams.logBuilder->getReplacementObject(&replacementObject));
+        invariant(applyParams.logBuilder->getReplacementObject(&replacementObject));
         for (auto current = applyParams.element.leftChild(); current.ok();
              current = current.rightSibling()) {
-            invariantOK(replacementObject.appendElement(current.getValue()));
+            invariant(replacementObject.appendElement(current.getValue()));
         }
     }
 
diff --git a/src/mongo/db/update/pop_node.cpp b/src/mongo/db/update/pop_node.cpp
index 412e913455b..c8332a2a04a 100644
--- a/src/mongo/db/update/pop_node.cpp
+++ b/src/mongo/db/update/pop_node.cpp
@@ -63,7 +63,7 @@ ModifierNode::ModifyResult PopNode::updateExistingElement(
     }
 
     auto elementToRemove = _popFromFront ? element->leftChild() : element->rightChild();
-    invariantOK(elementToRemove.remove());
+    invariant(elementToRemove.remove());
 
     return ModifyResult::kNormalUpdate;
 }
diff --git a/src/mongo/db/update/push_node.cpp b/src/mongo/db/update/push_node.cpp
index ac235e722f9..27d97e395c8 100644
--- a/src/mongo/db/update/push_node.cpp
+++ b/src/mongo/db/update/push_node.cpp
@@ -207,21 +207,21 @@ ModifierNode::ModifyResult PushNode::insertElementsWithPosition(
     // variable.
     ModifyResult result;
     if (arraySize == 0) {
-        invariantOK(array->pushBack(firstElementToInsert));
+        invariant(array->pushBack(firstElementToInsert));
         result = ModifyResult::kNormalUpdate;
     } else if (position > arraySize) {
-        invariantOK(array->pushBack(firstElementToInsert));
+        invariant(array->pushBack(firstElementToInsert));
         result = ModifyResult::kArrayAppendUpdate;
     } else if (position > 0) {
         auto insertAfter = getNthChild(*array, position - 1);
-        invariantOK(insertAfter.addSiblingRight(firstElementToInsert));
+        invariant(insertAfter.addSiblingRight(firstElementToInsert));
         result = ModifyResult::kNormalUpdate;
     } else if (position < 0 && -position < arraySize) {
         auto insertAfter = getNthChild(*array, arraySize - (-position) - 1);
-        invariantOK(insertAfter.addSiblingRight(firstElementToInsert));
+        invariant(insertAfter.addSiblingRight(firstElementToInsert));
         result = ModifyResult::kNormalUpdate;
     } else {
-        invariantOK(array->pushFront(firstElementToInsert));
+        invariant(array->pushFront(firstElementToInsert));
         result = ModifyResult::kNormalUpdate;
     }
 
@@ -232,7 +232,7 @@ ModifierNode::ModifyResult PushNode::insertElementsWithPosition(
                     [&document](auto& insertAfter, auto& valueToInsert) {
                         auto nextElementToInsert =
                             document.makeElementWithNewFieldName(StringData(), valueToInsert);
-                        invariantOK(insertAfter.addSiblingRight(nextElementToInsert));
+                        invariant(insertAfter.addSiblingRight(nextElementToInsert));
                         return nextElementToInsert;
                     });
 
@@ -263,11 +263,11 @@ ModifierNode::ModifyResult PushNode::performPush(mutablebson::Element* element,
     while (static_cast<long long>(countChildren(*element)) > std::abs(_slice)) {
         result = ModifyResult::kNormalUpdate;
         if (_slice >= 0) {
-            invariantOK(element->popBack());
+            invariant(element->popBack());
         } else {
             // A negative value in '_slice' trims the array down to abs(_slice) but removes entries
             // from the front of the array instead of the back.
-            invariantOK(element->popFront());
+            invariant(element->popFront());
         }
     }
 
@@ -310,7 +310,7 @@ void PushNode::logUpdate(LogBuilder* logBuilder,
 
 void PushNode::setValueForNewElement(mutablebson::Element* element) const {
     BSONObj emptyArray;
-    invariantOK(element->setValueArray(emptyArray));
+    invariant(element->setValueArray(emptyArray));
     (void)performPush(element, nullptr);
 }
 
diff --git a/src/mongo/db/update/rename_node.cpp b/src/mongo/db/update/rename_node.cpp
index 3a725218763..acdca72495d 100644
--- a/src/mongo/db/update/rename_node.cpp
+++ b/src/mongo/db/update/rename_node.cpp
@@ -71,12 +71,12 @@ public:
 protected:
     ModifierNode::ModifyResult updateExistingElement(
         mutablebson::Element* element, std::shared_ptr<FieldRef> elementPath) const final {
-        invariantOK(element->setValueElement(_elemToSet));
+        invariant(element->setValueElement(_elemToSet));
         return ModifyResult::kNormalUpdate;
     }
 
     void setValueForNewElement(mutablebson::Element* element) const final {
-        invariantOK(element->setValueElement(_elemToSet));
+        invariant(element->setValueElement(_elemToSet));
     }
 
     bool allowCreation() const final {
diff --git a/src/mongo/db/update/set_node.cpp b/src/mongo/db/update/set_node.cpp
index 7411da5beb4..571e4862508 100644
--- a/src/mongo/db/update/set_node.cpp
+++ b/src/mongo/db/update/set_node.cpp
@@ -49,13 +49,13 @@ ModifierNode::ModifyResult SetNode::updateExistingElement(
     if (element->getValue().binaryEqualValues(_val)) {
         return ModifyResult::kNoOp;
     } else {
-        invariantOK(element->setValueBSONElement(_val));
+        invariant(element->setValueBSONElement(_val));
         return ModifyResult::kNormalUpdate;
     }
 }
 
 void SetNode::setValueForNewElement(mutablebson::Element* element) const {
-    invariantOK(element->setValueBSONElement(_val));
+    invariant(element->setValueBSONElement(_val));
 }
 
 }  // namespace mongo
diff --git a/src/mongo/db/update/unset_node.cpp b/src/mongo/db/update/unset_node.cpp
index 9c07e1ea0b0..ad82a2b7f54 100644
--- a/src/mongo/db/update/unset_node.cpp
+++ b/src/mongo/db/update/unset_node.cpp
@@ -46,11 +46,11 @@ ModifierNode::ModifyResult UnsetNode::updateExistingElement(
 
     invariant(parent.ok());
     if (!parent.isType(BSONType::Array)) {
-        invariantOK(element->remove());
+        invariant(element->remove());
     } else {
         // Special case: An $unset on an array element sets it to null instead of removing it from
         // the array.
-        invariantOK(element->setValueNull());
+        invariant(element->setValueNull());
     }
 
     return ModifyResult::kNormalUpdate;
diff --git a/src/mongo/db/update/update_driver.cpp b/src/mongo/db/update/update_driver.cpp
index 41fa407ebc0..d8b824316cb 100644
--- a/src/mongo/db/update/update_driver.cpp
+++ b/src/mongo/db/update/update_driver.cpp
@@ -285,7 +285,7 @@ Status UpdateDriver::update(StringData matchedField,
         //
         // We also don't need to specify the semantics for a full document replacement (and there
         // would be no place to put a "$v" field in the update document).
-        invariantOK(logBuilder.setUpdateSemantics(UpdateSemantics::kUpdateNode));
+        invariant(logBuilder.setUpdateSemantics(UpdateSemantics::kUpdateNode));
     }
 
     if (_logOp && logOpRec)
diff --git a/src/mongo/s/chunk.cpp b/src/mongo/s/chunk.cpp
index 9e52a811405..42ea3feb496 100644
--- a/src/mongo/s/chunk.cpp
+++ b/src/mongo/s/chunk.cpp
@@ -64,7 +64,7 @@ ChunkInfo::ChunkInfo(const ChunkType& from)
       _history(from.getHistory()),
       _jumbo(from.getJumbo()),
       _dataWritten(mkDataWritten()) {
-    invariantOK(from.validate());
+    invariant(from.validate());
     if (!_history.empty()) {
         invariant(_shardId == _history.front().getShard());
     }
diff --git a/src/mongo/s/query/cluster_cursor_manager.cpp b/src/mongo/s/query/cluster_cursor_manager.cpp
index 99e6d9761c0..f42465e845d 100644
--- a/src/mongo/s/query/cluster_cursor_manager.cpp
+++ b/src/mongo/s/query/cluster_cursor_manager.cpp
@@ -421,7 +421,7 @@ void ClusterCursorManager::detachAndKillCursor(stdx::unique_lock<stdx::mutex> lk
                                                const NamespaceString& nss,
                                                CursorId cursorId) {
     auto detachedCursor = _detachCursor(lk, nss, cursorId);
-    invariantOK(detachedCursor.getStatus());
+    invariant(detachedCursor.getStatus());
 
     // Deletion of the cursor can happen out of the lock.
     lk.unlock();
diff --git a/src/mongo/s/query/cluster_find.cpp b/src/mongo/s/query/cluster_find.cpp
index b47cd757402..2ff23072251 100644
--- a/src/mongo/s/query/cluster_find.cpp
+++ b/src/mongo/s/query/cluster_find.cpp
@@ -164,7 +164,7 @@ StatusWith<std::unique_ptr<QueryRequest>> transformQueryForShards(
     // Therefore, we must always send singleBatch=false (wantMore=true) to the shards.
     newQR->setWantMore(true);
 
-    invariantOK(newQR->validate());
+    invariant(newQR->validate());
     return std::move(newQR);
 }
 
diff --git a/src/mongo/s/request_types/balance_chunk_request_type.cpp b/src/mongo/s/request_types/balance_chunk_request_type.cpp
index 04a5aa2ced4..2a6d7e7a5eb 100644
--- a/src/mongo/s/request_types/balance_chunk_request_type.cpp
+++ b/src/mongo/s/request_types/balance_chunk_request_type.cpp
@@ -138,7 +138,7 @@ BSONObj BalanceChunkRequest::serializeToMoveCommandForConfig(
     int64_t maxChunkSizeBytes,
     const MigrationSecondaryThrottleOptions& secondaryThrottle,
     bool waitForDelete) {
-    invariantOK(chunk.validate());
+    invariant(chunk.validate());
 
     BSONObjBuilder cmdBuilder;
     cmdBuilder.append(kConfigSvrMoveChunk, 1);
@@ -158,7 +158,7 @@ BSONObj BalanceChunkRequest::serializeToMoveCommandForConfig(
 }
 
 BSONObj BalanceChunkRequest::serializeToRebalanceCommandForConfig(const ChunkType& chunk) {
-    invariantOK(chunk.validate());
+    invariant(chunk.validate());
 
     BSONObjBuilder cmdBuilder;
     cmdBuilder.append(kConfigSvrMoveChunk, 1);
diff --git a/src/mongo/s/sharding_egress_metadata_hook_for_mongos.cpp b/src/mongo/s/sharding_egress_metadata_hook_for_mongos.cpp
index 1e01a9a1f7f..e64860f2513 100644
--- a/src/mongo/s/sharding_egress_metadata_hook_for_mongos.cpp
+++ b/src/mongo/s/sharding_egress_metadata_hook_for_mongos.cpp
@@ -63,7 +63,7 @@ void ShardingEgressMetadataHookForMongos::_saveGLEStats(const BSONObj& metadata,
     if (!shardConn.isOK()) {
         severe() << "got bad host string in saveGLEStats: " << hostString;
     }
-    invariantOK(shardConn.getStatus());
+    invariant(shardConn.getStatus());
 
     auto shardingMetadata = std::move(swShardingMetadata.getValue());
 
diff --git a/src/mongo/shell/bench.cpp b/src/mongo/shell/bench.cpp
index eb392fcab34..c188680d230 100644
--- a/src/mongo/shell/bench.cpp
+++ b/src/mongo/shell/bench.cpp
@@ -867,7 +867,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {
                             if (_config->useSnapshotReads) {
                                 qr->setReadConcern(readConcernSnapshot);
                             }
-                            invariantOK(qr->validate());
+                            invariant(qr->validate());
 
                             BenchRunEventTrace _bret(&stats.findOneCounter);
                             boost::optional<TxnNumber> txnNumberForOp;
@@ -993,7 +993,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {
                             if (_config->useSnapshotReads) {
                                 qr->setReadConcern(readConcernSnapshot);
                             }
-                            invariantOK(qr->validate());
+                            invariant(qr->validate());
 
                             BenchRunEventTrace _bret(&stats.queryCounter);
                             boost::optional<TxnNumber> txnNumberForOp;
diff --git a/src/mongo/unittest/unittest_main.cpp b/src/mongo/unittest/unittest_main.cpp
index 0b4adf11d3d..496221a87f9 100644
--- a/src/mongo/unittest/unittest_main.cpp
+++ b/src/mongo/unittest/unittest_main.cpp
@@ -85,8 +85,8 @@ int main(int argc, char** argv, char** envp) {
     std::string filter;
     int repeat = 1;
     // "list" and "repeat" will be assigned with default values, if not present.
-    invariantOK(environment.get("list", &list));
-    invariantOK(environment.get("repeat", &repeat));
+    invariant(environment.get("list", &list));
+    invariant(environment.get("repeat", &repeat));
     // The default values of "suite" and "filter" are empty.
     environment.get("suite", &suites).ignore();
     environment.get("filter", &filter).ignore();
diff --git a/src/mongo/util/clock_source.cpp b/src/mongo/util/clock_source.cpp
index c8e70537dbc..d562089c27a 100644
--- a/src/mongo/util/clock_source.cpp
+++ b/src/mongo/util/clock_source.cpp
@@ -57,7 +57,7 @@ stdx::cv_status ClockSource::waitForConditionUntil(stdx::condition_variable& cv,
     alarmInfo->waitMutex = m.mutex();
     const auto waiterThreadId = stdx::this_thread::get_id();
     bool invokedAlarmInline = false;
-    invariantOK(setAlarm(deadline, [alarmInfo, waiterThreadId, &invokedAlarmInline] {
+    invariant(setAlarm(deadline, [alarmInfo, waiterThreadId, &invokedAlarmInline] {
         stdx::lock_guard<stdx::mutex> controlLk(alarmInfo->controlMutex);
         alarmInfo->cvWaitResult = stdx::cv_status::timeout;
         if (!alarmInfo->waitMutex) {