summaryrefslogtreecommitdiff
path: root/src/mongo/db/storage
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/storage')
-rw-r--r--src/mongo/db/storage/kv/kv_storage_engine.cpp6
-rw-r--r--src/mongo/db/storage/mobile/mobile_index_test.cpp2
-rw-r--r--src/mongo/db/storage/mobile/mobile_record_store.cpp2
-rw-r--r--src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.cpp2
-rw-r--r--src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp4
-rw-r--r--src/mongo/db/storage/wiredtiger/wiredtiger_snapshot_manager.cpp2
6 files changed, 9 insertions, 9 deletions
diff --git a/src/mongo/db/storage/kv/kv_storage_engine.cpp b/src/mongo/db/storage/kv/kv_storage_engine.cpp
index d70d06f4d82..b7a64f30d94 100644
--- a/src/mongo/db/storage/kv/kv_storage_engine.cpp
+++ b/src/mongo/db/storage/kv/kv_storage_engine.cpp
@@ -145,7 +145,7 @@ void KVStorageEngine::loadCatalog(OperationContext* opCtx) {
<< " unknown to storage engine after unclean shutdown";
WriteUnitOfWork wuow(opCtx);
- fassertStatusOK(50716, _catalog->dropCollection(opCtx, coll));
+ fassert(50716, _catalog->dropCollection(opCtx, coll));
wuow.commit();
continue;
}
@@ -236,7 +236,7 @@ KVStorageEngine::reconcileCatalogAndIdents(OperationContext* opCtx) {
const auto& toRemove = it;
log() << "Dropping unknown ident: " << toRemove;
WriteUnitOfWork wuow(opCtx);
- fassertStatusOK(40591, _engine->dropIdent(opCtx, toRemove));
+ fassert(40591, _engine->dropIdent(opCtx, toRemove));
wuow.commit();
}
@@ -305,7 +305,7 @@ KVStorageEngine::reconcileCatalogAndIdents(OperationContext* opCtx) {
log() << "Dropping unfinished index. Collection: " << coll
<< " Index: " << indexName;
// Ensure the `ident` is dropped while we have the `indexIdent` value.
- fassertStatusOK(50713, _engine->dropIdent(opCtx, indexIdent));
+ fassert(50713, _engine->dropIdent(opCtx, indexIdent));
indexesToDrop.push_back(indexName);
continue;
}
diff --git a/src/mongo/db/storage/mobile/mobile_index_test.cpp b/src/mongo/db/storage/mobile/mobile_index_test.cpp
index a9c2e6fbd78..31419df65fb 100644
--- a/src/mongo/db/storage/mobile/mobile_index_test.cpp
+++ b/src/mongo/db/storage/mobile/mobile_index_test.cpp
@@ -57,7 +57,7 @@ public:
std::string ident("index_" + std::to_string(inc++));
OperationContextNoop opCtx(newRecoveryUnit().release());
Status status = MobileIndex::create(&opCtx, ident);
- fassertStatusOK(37052, status);
+ fassert(37052, status);
if (isUnique) {
return stdx::make_unique<MobileIndexUnique>(_ordering, ident);
diff --git a/src/mongo/db/storage/mobile/mobile_record_store.cpp b/src/mongo/db/storage/mobile/mobile_record_store.cpp
index 01c8422ce3f..b89ca31e6b6 100644
--- a/src/mongo/db/storage/mobile/mobile_record_store.cpp
+++ b/src/mongo/db/storage/mobile/mobile_record_store.cpp
@@ -466,7 +466,7 @@ Status MobileRecordStore::updateRecord(OperationContext* opCtx,
_changeDataSize(opCtx, -dataSizeBefore + len);
if (notifier) {
- fassertStatusOK(37054, notifier->recordStoreGoingToUpdateInPlace(opCtx, recId));
+ fassert(37054, notifier->recordStoreGoingToUpdateInPlace(opCtx, recId));
}
std::string updateQuery = "UPDATE \"" + _ident + "\" SET data = ? " + "WHERE rec_id = ?;";
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.cpp
index 13e2bc7c32a..53c7e6918f4 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.cpp
@@ -264,7 +264,7 @@ uint64_t WiredTigerOplogManager::_fetchAllCommittedValue(WT_CONNECTION* conn) {
}
uint64_t tmp;
- fassertStatusOK(38002, parseNumberFromStringWithBase(buf, 16, &tmp));
+ fassert(38002, parseNumberFromStringWithBase(buf, 16, &tmp));
return tmp;
}
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
index 48b1b9b6717..c7278a60de5 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
@@ -78,7 +78,7 @@ MONGO_STATIC_ASSERT(kCurrentRecordStoreVersion <= kMaximumRecordStoreVersion);
void checkOplogFormatVersion(OperationContext* opCtx, const std::string& uri) {
StatusWith<BSONObj> appMetadata = WiredTigerUtil::getApplicationMetadata(opCtx, uri);
- fassertStatusOK(39999, appMetadata);
+ fassert(39999, appMetadata);
fassertNoTrace(39998, appMetadata.getValue().getIntField("oplogKeyExtractionVersion") == 1);
}
@@ -1152,7 +1152,7 @@ Status WiredTigerRecordStore::_insertRecords(OperationContext* opCtx,
}
if (!ts.isNull()) {
LOG(4) << "inserting record with timestamp " << ts;
- fassertStatusOK(39001, opCtx->recoveryUnit()->setTimestamp(ts));
+ fassert(39001, opCtx->recoveryUnit()->setTimestamp(ts));
}
setKey(c, record.id);
WiredTigerItem value(record.data.data(), record.data.size());
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_snapshot_manager.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_snapshot_manager.cpp
index 9121b7ad984..fc921527b79 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_snapshot_manager.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_snapshot_manager.cpp
@@ -94,7 +94,7 @@ Timestamp WiredTigerSnapshotManager::beginTransactionOnCommittedSnapshot(
}
auto status = setTransactionReadTimestamp(_committedSnapshot.get(), session);
- fassertStatusOK(30635, status);
+ fassert(30635, status);
return *_committedSnapshot;
}