summaryrefslogtreecommitdiff
path: root/src/mongo/db
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db')
-rw-r--r--src/mongo/db/active_index_builds.cpp6
-rw-r--r--src/mongo/db/catalog/index_builds_manager.cpp6
-rw-r--r--src/mongo/db/catalog/multi_index_block.cpp21
-rw-r--r--src/mongo/db/index/index_build_interceptor.cpp6
-rw-r--r--src/mongo/db/index_builds_coordinator.cpp69
5 files changed, 54 insertions, 54 deletions
diff --git a/src/mongo/db/active_index_builds.cpp b/src/mongo/db/active_index_builds.cpp
index d9195ca23d9..bfacd4a7b95 100644
--- a/src/mongo/db/active_index_builds.cpp
+++ b/src/mongo/db/active_index_builds.cpp
@@ -133,8 +133,10 @@ void ActiveIndexBuilds::unregisterIndexBuild(
LOGV2_DEBUG(4656004,
1,
- "Index build: Unregistering",
- "buildUUID"_attr = replIndexBuildState->buildUUID);
+ "Index build: unregistering",
+ "buildUUID"_attr = replIndexBuildState->buildUUID,
+ "collectionUUID"_attr = replIndexBuildState->collectionUUID);
+
indexBuildsManager->unregisterIndexBuild(replIndexBuildState->buildUUID);
_indexBuildsCompletedGen++;
_indexBuildsCondVar.notify_all();
diff --git a/src/mongo/db/catalog/index_builds_manager.cpp b/src/mongo/db/catalog/index_builds_manager.cpp
index 78c49b3dd14..479c0afef2c 100644
--- a/src/mongo/db/catalog/index_builds_manager.cpp
+++ b/src/mongo/db/catalog/index_builds_manager.cpp
@@ -342,7 +342,11 @@ bool IndexBuildsManager::abortIndexBuildWithoutCleanup(OperationContext* opCtx,
return false;
}
- LOGV2(20347, "Index build aborted without cleanup", "buildUUID"_attr = buildUUID);
+ LOGV2(20347,
+ "Index build: aborted without cleanup",
+ "buildUUID"_attr = buildUUID,
+ "collectionUUID"_attr = collection->uuid(),
+ logAttrs(collection->ns()));
builder.getValue()->abortWithoutCleanup(opCtx, collection, isResumable);
diff --git a/src/mongo/db/catalog/multi_index_block.cpp b/src/mongo/db/catalog/multi_index_block.cpp
index abee242c0ad..c145eaf635e 100644
--- a/src/mongo/db/catalog/multi_index_block.cpp
+++ b/src/mongo/db/catalog/multi_index_block.cpp
@@ -296,8 +296,9 @@ StatusWith<std::vector<BSONObj>> MultiIndexBlock::init(
LOGV2(20384,
"Index build: starting",
- logAttrs(collection->ns()),
"buildUUID"_attr = _buildUUID,
+ "collectionUUID"_attr = _collectionUUID,
+ logAttrs(collection->ns()),
"properties"_attr = *descriptor,
"method"_attr = _method,
"maxTemporaryMemoryUsageMB"_attr =
@@ -320,8 +321,8 @@ StatusWith<std::vector<BSONObj>> MultiIndexBlock::init(
LOGV2(20346,
"Index build: initialized",
"buildUUID"_attr = _buildUUID,
- logAttrs(ns),
"collectionUUID"_attr = _collectionUUID,
+ logAttrs(ns),
"initializationTimestamp"_attr = commitTs);
});
@@ -501,6 +502,7 @@ Status MultiIndexBlock::insertAllDocumentsInCollection(
LOGV2(4984704,
"Index build: collection scan stopped",
"buildUUID"_attr = _buildUUID,
+ "collectionUUID"_attr = _collectionUUID,
"totalRecords"_attr = n,
"duration"_attr = duration_cast<Milliseconds>(Seconds(t.seconds())),
"phase"_attr = IndexBuildPhase_serializer(_phase),
@@ -548,9 +550,10 @@ Status MultiIndexBlock::insertAllDocumentsInCollection(
progress->finished();
LOGV2(20391,
- "Index build: collection scan done. scanned {n} total records in {t_seconds} seconds",
"Index build: collection scan done",
"buildUUID"_attr = _buildUUID,
+ "collectionUUID"_attr = _collectionUUID,
+ logAttrs(collection->ns()),
"totalRecords"_attr = n,
"readSource"_attr =
RecoveryUnit::toString(opCtx->recoveryUnit()->getTimestampReadSource()),
@@ -870,13 +873,15 @@ void MultiIndexBlock::_writeStateToDisk(OperationContext* opCtx,
auto status = rs->rs()->insertRecord(opCtx, obj.objdata(), obj.objsize(), Timestamp());
if (!status.isOK()) {
LOGV2_ERROR(4841501,
- "Failed to write resumable index build state to disk",
- "buildUUID"_attr = *_buildUUID,
+ "Index build: failed to write resumable state to disk",
+ "buildUUID"_attr = _buildUUID,
+ "collectionUUID"_attr = _collectionUUID,
+ logAttrs(collection->ns()),
"details"_attr = obj,
"error"_attr = status.getStatus());
dassert(status,
str::stream() << "Failed to write resumable index build state to disk. UUID: "
- << *_buildUUID);
+ << _buildUUID);
rs->finalizeTemporaryTable(opCtx, TemporaryRecordStore::FinalizationAction::kDelete);
return;
@@ -886,7 +891,9 @@ void MultiIndexBlock::_writeStateToDisk(OperationContext* opCtx,
LOGV2(4841502,
"Index build: wrote resumable state to disk",
- "buildUUID"_attr = *_buildUUID,
+ "buildUUID"_attr = _buildUUID,
+ "collectionUUID"_attr = _collectionUUID,
+ logAttrs(collection->ns()),
"details"_attr = obj);
rs->finalizeTemporaryTable(opCtx, TemporaryRecordStore::FinalizationAction::kKeep);
diff --git a/src/mongo/db/index/index_build_interceptor.cpp b/src/mongo/db/index/index_build_interceptor.cpp
index fec2b1a195b..a9227adc1fc 100644
--- a/src/mongo/db/index/index_build_interceptor.cpp
+++ b/src/mongo/db/index/index_build_interceptor.cpp
@@ -268,11 +268,13 @@ Status IndexBuildInterceptor::drainWritesIntoIndex(OperationContext* opCtx,
int logLevel = (_numApplied - appliedAtStart > 0) ? 0 : 1;
LOGV2_DEBUG(20689,
logLevel,
- "index build: drained side writes",
+ "Index build: drained side writes",
+ "index"_attr = _indexCatalogEntry->descriptor()->indexName(),
+ "collectionUUID"_attr = coll->uuid(),
+ logAttrs(coll->ns()),
"numApplied"_attr = (_numApplied - appliedAtStart),
"totalInserted"_attr = totalInserted,
"totalDeleted"_attr = totalDeleted,
- "indexName"_attr = _indexCatalogEntry->descriptor()->indexName(),
"durationMillis"_attr = timer.millis());
return Status::OK();
diff --git a/src/mongo/db/index_builds_coordinator.cpp b/src/mongo/db/index_builds_coordinator.cpp
index 7799ec64197..a02fa7c8460 100644
--- a/src/mongo/db/index_builds_coordinator.cpp
+++ b/src/mongo/db/index_builds_coordinator.cpp
@@ -268,10 +268,10 @@ void logFailure(Status status,
const NamespaceString& nss,
std::shared_ptr<ReplIndexBuildState> replState) {
LOGV2(20649,
- "Index build failed",
+ "Index build: failed",
"buildUUID"_attr = replState->buildUUID,
- "namespace"_attr = nss,
- "uuid"_attr = replState->collectionUUID,
+ "collectionUUID"_attr = replState->collectionUUID,
+ logAttrs(nss),
"error"_attr = status);
}
@@ -418,8 +418,7 @@ bool isIndexBuildResumable(OperationContext* opCtx,
auto swCommitQuorum = indexbuildentryhelpers::getCommitQuorum(opCtx, replState.buildUUID);
if (!swCommitQuorum.isOK()) {
LOGV2(5044600,
- "Index build: cannot read commit quorum from config db. "
- "Index build will not be resumable.",
+ "Index build: cannot read commit quorum from config db, will not be resumable",
"buildUUID"_attr = replState.buildUUID,
"error"_attr = swCommitQuorum.getStatus());
return false;
@@ -559,8 +558,6 @@ Status IndexBuildsCoordinator::_startIndexBuildForRecovery(OperationContext* opC
if (!DurableCatalog::get(opCtx)->isIndexPresent(
opCtx, collection->getCatalogId(), indexNames[i])) {
LOGV2(20652,
- "The index for build {buildUUID} was not found while trying to drop the "
- "index during recovery: {index}",
"An index was not found in the catalog while trying to drop the index during "
"recovery",
"buildUUID"_attr = buildUUID,
@@ -706,13 +703,6 @@ Status IndexBuildsCoordinator::_setUpResumeIndexBuild(OperationContext* opCtx,
status = _indexBuildsManager.setUpIndexBuild(
opCtx, collection, specs, buildUUID, MultiIndexBlock::kNoopOnInitFn, options, resumeInfo);
if (!status.isOK()) {
- LOGV2(4841705,
- "Failed to resume index build",
- "buildUUID"_attr = buildUUID,
- logAttrs(collection->ns()),
- "collectionUUID"_attr = collectionUUID,
- "error"_attr = status);
-
activeIndexBuilds.unregisterIndexBuild(&_indexBuildsManager, replIndexBuildState);
}
@@ -993,8 +983,6 @@ boost::optional<UUID> IndexBuildsCoordinator::abortIndexBuildByIndexNames(
}
LOGV2(23880,
- "About to abort index builder: {buildUUID} on collection: "
- "{collectionUUID}. First index: {firstIndex}",
"About to abort index builder",
"buildUUID"_attr = replState->buildUUID,
"collectionUUID"_attr = collectionUUID,
@@ -1055,7 +1043,6 @@ bool IndexBuildsCoordinator::abortIndexBuildByBuildUUID(OperationContext* opCtx,
auto replStateResult = _getIndexBuild(buildUUID);
if (!replStateResult.isOK()) {
LOGV2(20656,
- "ignoring error while aborting index build {buildUUID}: {error}",
"Ignoring error while aborting index build",
"buildUUID"_attr = buildUUID,
"error"_attr = replStateResult.getStatus());
@@ -1374,11 +1361,9 @@ void IndexBuildsCoordinator::restartIndexBuildsForRecovery(
LOGV2(4841700,
"Index build: resuming",
- logAttrs(nss.get()),
- "collectionUUID"_attr = collUUID,
"buildUUID"_attr = buildUUID,
- "specs"_attr = indexSpecs,
- "phase"_attr = IndexBuildPhase_serializer(resumeInfo.getPhase()),
+ "collectionUUID"_attr = collUUID,
+ logAttrs(nss.get()),
"details"_attr = resumeInfo.toBSON());
try {
@@ -1389,8 +1374,10 @@ void IndexBuildsCoordinator::restartIndexBuildsForRecovery(
successfullyResumed.insert(buildUUID);
} catch (const DBException& e) {
LOGV2(4841701,
- "Failed to resume index build, restarting instead",
+ "Index build: failed to resume, restarting instead",
"buildUUID"_attr = buildUUID,
+ "collectionUUID"_attr = collUUID,
+ logAttrs(*nss),
"error"_attr = e);
// Clean up the persisted Sorter data since resuming failed.
@@ -1400,9 +1387,11 @@ void IndexBuildsCoordinator::restartIndexBuildsForRecovery(
}
LOGV2(5043100,
- "Removing resumable index build temp file",
- "file"_attr = index.getFileName(),
- "buildUUID"_attr = buildUUID);
+ "Index build: removing resumable temp file",
+ "buildUUID"_attr = buildUUID,
+ "collectionUUID"_attr = collUUID,
+ logAttrs(*nss),
+ "file"_attr = index.getFileName());
boost::system::error_code ec;
boost::filesystem::remove(
@@ -1410,9 +1399,11 @@ void IndexBuildsCoordinator::restartIndexBuildsForRecovery(
if (ec) {
LOGV2(5043101,
- "Failed to remove resumable index build temp file",
- "file"_attr = index.getFileName(),
+ "Index build: failed to remove resumable temp file",
"buildUUID"_attr = buildUUID,
+ "collectionUUID"_attr = collUUID,
+ logAttrs(*nss),
+ "file"_attr = index.getFileName(),
"error"_attr = ec.message());
}
}
@@ -1430,9 +1421,9 @@ void IndexBuildsCoordinator::restartIndexBuildsForRecovery(
LOGV2(20660,
"Index build: restarting",
- logAttrs(nss.get()),
+ "buildUUID"_attr = buildUUID,
"collectionUUID"_attr = build.collUUID,
- "buildUUID"_attr = buildUUID);
+ logAttrs(nss.get()));
IndexBuildsCoordinator::IndexBuildOptions indexBuildOptions;
// Indicate that the initialization should not generate oplog entries or timestamps for the
// first catalog write, and that the original durable catalog entries should be dropped and
@@ -2211,6 +2202,7 @@ void IndexBuildsCoordinator::_awaitLastOpTimeBeforeInterceptorsMajorityCommitted
LOGV2(4847600,
"Index build: waiting for last optime before interceptors to be majority committed",
"buildUUID"_attr = replState->buildUUID,
+ "collectionUUID"_attr = replState->collectionUUID,
"deadline"_attr = deadline,
"timeout"_attr = timeout,
"lastOpTime"_attr = lastOpTimeBeforeInterceptors);
@@ -2238,8 +2230,9 @@ void IndexBuildsCoordinator::_awaitLastOpTimeBeforeInterceptorsMajorityCommitted
replState->clearLastOpTimeBeforeInterceptors();
LOGV2(5053900,
"Index build: timed out waiting for the last optime before interceptors to be "
- "majority committed. Continuing as a non-resumable index build.",
+ "majority committed, continuing as a non-resumable index build",
"buildUUID"_attr = replState->buildUUID,
+ "collectionUUID"_attr = replState->collectionUUID,
"deadline"_attr = deadline,
"timeout"_attr = timeout,
"lastOpTime"_attr = lastOpTimeBeforeInterceptors,
@@ -2592,9 +2585,9 @@ IndexBuildsCoordinator::CommitResult IndexBuildsCoordinator::_insertKeysFromSide
LOGV2(20663,
"Index build: completed successfully",
"buildUUID"_attr = replState->buildUUID,
- "namespace"_attr = collection->ns(),
- "uuid"_attr = replState->collectionUUID,
- "indexesBuilt"_attr = replState->indexSpecs.size(),
+ "collectionUUID"_attr = replState->collectionUUID,
+ logAttrs(collection->ns()),
+ "indexesBuilt"_attr = replState->indexNames,
"numIndexesBefore"_attr = replState->stats.numIndexesBefore,
"numIndexesAfter"_attr = replState->stats.numIndexesAfter);
return CommitResult::kSuccess;
@@ -2623,11 +2616,7 @@ StatusWith<std::pair<long long, long long>> IndexBuildsCoordinator::_runIndexReb
indexCatalogStats.numIndexesBefore = getNumIndexesTotal(opCtx, collection.get());
try {
- LOGV2(20673,
- "Index builds manager starting: {buildUUID}: {namespace}",
- "Index builds manager starting",
- "buildUUID"_attr = buildUUID,
- logAttrs(nss));
+ LOGV2(20673, "Index builds manager starting", "buildUUID"_attr = buildUUID, logAttrs(nss));
std::tie(numRecords, dataSize) =
uassertStatusOK(_indexBuildsManager.startBuildingIndexForRecovery(
@@ -2655,9 +2644,6 @@ StatusWith<std::pair<long long, long long>> IndexBuildsCoordinator::_runIndexReb
indexCatalogStats.numIndexesAfter = getNumIndexesTotal(opCtx, collection.get());
LOGV2(20674,
- "Index builds manager completed successfully: {buildUUID}: {namespace}. Index specs "
- "requested: {indexSpecsRequested}. Indexes in catalog before build: "
- "{numIndexesBefore}. Indexes in catalog after build: {numIndexesAfter}",
"Index builds manager completed successfully",
"buildUUID"_attr = buildUUID,
logAttrs(nss),
@@ -2668,7 +2654,6 @@ StatusWith<std::pair<long long, long long>> IndexBuildsCoordinator::_runIndexReb
status = ex.toStatus();
invariant(status != ErrorCodes::IndexAlreadyExists);
LOGV2(20675,
- "Index builds manager failed: {buildUUID}: {namespace}: {error}",
"Index builds manager failed",
"buildUUID"_attr = buildUUID,
logAttrs(nss),
View Lorry Controller Status