diff --git a/fdbserver/RestoreApplier.actor.cpp b/fdbserver/RestoreApplier.actor.cpp index 495017c2b2..b94a7647f8 100644 --- a/fdbserver/RestoreApplier.actor.cpp +++ b/fdbserver/RestoreApplier.actor.cpp @@ -84,7 +84,7 @@ ACTOR Future restoreApplierCore(RestoreApplierInterface applierInterf, int updateProcessStatsTimer = delay(SERVER_KNOBS->FASTRESTORE_UPDATE_PROCESS_STATS_INTERVAL); } when(wait(exitRole)) { - TraceEvent("FastRestore").detail("RestoreApplierCore", "ExitRole").detail("NodeID", self->id()); + TraceEvent("RestoreApplierCoreExitRole").detail("NodeID", self->id()); break; } } diff --git a/fdbserver/RestoreApplier.actor.h b/fdbserver/RestoreApplier.actor.h index 352dfd3366..c3157413af 100644 --- a/fdbserver/RestoreApplier.actor.h +++ b/fdbserver/RestoreApplier.actor.h @@ -327,7 +327,7 @@ struct ApplierBatchData : public ReferenceCounted { isAtomicOp((MutationRef::Type)m->type)) continue; else { - TraceEvent(SevError, "FastRestore").detail("UnknownMutationType", m->type); + TraceEvent(SevError, "FastRestoreApplier").detail("UnknownMutationType", m->type); return false; } } diff --git a/fdbserver/RestoreCommon.actor.h b/fdbserver/RestoreCommon.actor.h index 9b0d0f6497..00e235814c 100644 --- a/fdbserver/RestoreCommon.actor.h +++ b/fdbserver/RestoreCommon.actor.h @@ -359,7 +359,7 @@ Future getBatchReplies(RequestStream Interface::*channel, std::ma .detail("ErrorCode", e.code()) .detail("ErrorInfo", e.what()); for (auto& request : requests) { - TraceEvent(SevWarn, "FastRestore") + TraceEvent(SevWarn, "FastRestoreLoader") .detail("SendBatchRequests", requests.size()) .detail("RequestID", request.first) .detail("Request", request.second.toString()); diff --git a/fdbserver/RestoreLoader.actor.cpp b/fdbserver/RestoreLoader.actor.cpp index 8e4b0f25ff..fbbd0257c3 100644 --- a/fdbserver/RestoreLoader.actor.cpp +++ b/fdbserver/RestoreLoader.actor.cpp @@ -111,13 +111,13 @@ ACTOR Future restoreLoaderCore(RestoreLoaderInterface loaderInterf, int no updateProcessStatsTimer = delay(SERVER_KNOBS->FASTRESTORE_UPDATE_PROCESS_STATS_INTERVAL); } when(wait(exitRole)) { - TraceEvent("FastRestore").detail("RestoreLoaderCore", "ExitRole").detail("NodeID", self->id()); + TraceEvent("FastRestoreLoaderCoreExitRole").detail("NodeID", self->id()); break; } } } catch (Error& e) { - TraceEvent(SevWarn, "FastRestore") - .detail("RestoreLoaderError", e.what()) + TraceEvent(SevWarn, "FastRestoreLoader", self->id()) + .detail("Error", e.what()) .detail("RequestType", requestTypeStr); break; } @@ -186,7 +186,7 @@ ACTOR static Future _parsePartitionedLogFileOnLoader( int rLen = wait(file->read(mutateString(buf), asset.len, asset.offset)); if (rLen != asset.len) throw restore_bad_read(); - TraceEvent("FastRestore") + TraceEvent("FastRestoreLoader") .detail("DecodingLogFile", asset.filename) .detail("Offset", asset.offset) .detail("Length", asset.len); @@ -687,7 +687,7 @@ bool concatenateBackupMutationForLogFile(SerializedMutationListMap* pMutationMap if (it == mutationMap.end()) { mutationMap.emplace(id, std::make_pair(val_input, 0)); if (part != 0) { - TraceEvent(SevError, "FastRestore") + TraceEvent(SevError, "FastRestoreLoader") .detail("FirstPartNotZero", part) .detail("KeyInput", getHexString(key_input)); } @@ -697,7 +697,7 @@ bool concatenateBackupMutationForLogFile(SerializedMutationListMap* pMutationMap auto& currentPart = it->second.second; if (part != (currentPart + 1)) { // Check if the same range or log file has been processed more than once! - TraceEvent(SevError, "FastRestore") + TraceEvent(SevError, "FastRestoreLoader") .detail("CurrentPart1", currentPart) .detail("CurrentPart2", part) .detail("KeyInput", getHexString(key_input)) @@ -828,7 +828,7 @@ ACTOR static Future _parseRangeFileToMutationsOnLoader( try { Standalone> kvs = wait(fileBackup::decodeRangeFileBlock(inFile, asset.offset, asset.len)); - TraceEvent("FastRestore") + TraceEvent("FastRestoreLoader") .detail("DecodedRangeFile", asset.filename) .detail("DataSize", kvs.contents().size()); blockData = kvs; @@ -906,7 +906,7 @@ ACTOR static Future _parseLogFileToMutationsOnLoader(NotifiedVersion* pPro // decodeLogFileBlock() must read block by block! state Standalone> data = wait(parallelFileRestore::decodeLogFileBlock(inFile, asset.offset, asset.len)); - TraceEvent("FastRestore") + TraceEvent("FastRestoreLoader") .detail("DecodedLogFile", asset.filename) .detail("Offset", asset.offset) .detail("Length", asset.len) diff --git a/fdbserver/RestoreLoader.actor.h b/fdbserver/RestoreLoader.actor.h index 9a1f941fc9..d2469fbcaa 100644 --- a/fdbserver/RestoreLoader.actor.h +++ b/fdbserver/RestoreLoader.actor.h @@ -169,7 +169,7 @@ struct RestoreLoaderData : RestoreRoleData, public ReferenceCounted(new LoaderBatchData(nodeID, batchIndex)); status[batchIndex] = Reference(new LoaderBatchStatus()); } diff --git a/fdbserver/RestoreMaster.actor.cpp b/fdbserver/RestoreMaster.actor.cpp index 881ba43951..d7c9f2b767 100644 --- a/fdbserver/RestoreMaster.actor.cpp +++ b/fdbserver/RestoreMaster.actor.cpp @@ -326,7 +326,7 @@ ACTOR static Future processRestoreRequest(Reference wait(waitForAll(fBatches)); - TraceEvent("FastRestore").detail("RestoreToVersion", request.targetVersion); + TraceEvent("FastRestoreMaster").detail("RestoreToVersion", request.targetVersion); return request.targetVersion; } @@ -945,7 +945,7 @@ ACTOR static Future signalRestoreCompleted(Reference se } } - TraceEvent("FastRestore").detail("RestoreMaster", "AllRestoreCompleted"); + TraceEvent("FastRestoreMasterAllRestoreCompleted"); return Void(); } diff --git a/fdbserver/RestoreMaster.actor.h b/fdbserver/RestoreMaster.actor.h index 04d47f32b1..67061e8417 100644 --- a/fdbserver/RestoreMaster.actor.h +++ b/fdbserver/RestoreMaster.actor.h @@ -89,7 +89,7 @@ struct MasterBatchData : public ReferenceCounted { if (applierToRange.find(applier.second) == applierToRange.end()) { applierToRange[applier.second] = applier.first; } else { - TraceEvent(SevError, "FastRestore") + TraceEvent(SevError, "FastRestoreMaster") .detail("SanityCheckApplierKeyRange", applierToRange.size()) .detail("ApplierID", applier.second) .detail("Key1", applierToRange[applier.second]) diff --git a/fdbserver/RestoreWorker.actor.cpp b/fdbserver/RestoreWorker.actor.cpp index 6d78dad9ef..e1b34fda2a 100644 --- a/fdbserver/RestoreWorker.actor.cpp +++ b/fdbserver/RestoreWorker.actor.cpp @@ -66,7 +66,7 @@ ACTOR Future handlerTerminateWorkerRequest(RestoreSimpleRequest req, Refer return Void(); })); - TraceEvent("FastRestore").detail("HandleTerminateWorkerReq", self->id()); + TraceEvent("FastRestoreWorker").detail("HandleTerminateWorkerReq", self->id()); return Void(); } @@ -97,7 +97,7 @@ void handleRecruitRoleRequest(RestoreRecruitRoleRequest req, Referenceadd(restoreLoaderCore(self->loaderInterf.get(), req.nodeIndex, cx)); - TraceEvent("FastRestore").detail("RecruitedLoaderNodeIndex", req.nodeIndex); + TraceEvent("FastRestoreWorker").detail("RecruitedLoaderNodeIndex", req.nodeIndex); req.reply.send( RestoreRecruitRoleReply(self->loaderInterf.get().id(), RestoreRole::Loader, self->loaderInterf.get())); } else if (req.role == RestoreRole::Applier) { @@ -111,12 +111,11 @@ void handleRecruitRoleRequest(RestoreRecruitRoleRequest req, Referenceadd(restoreApplierCore(self->applierInterf.get(), req.nodeIndex, cx)); - TraceEvent("FastRestore").detail("RecruitedApplierNodeIndex", req.nodeIndex); + TraceEvent("FastRestoreWorker").detail("RecruitedApplierNodeIndex", req.nodeIndex); req.reply.send( RestoreRecruitRoleReply(self->applierInterf.get().id(), RestoreRole::Applier, self->applierInterf.get())); } else { - TraceEvent(SevError, "FastRestore") - .detail("HandleRecruitRoleRequest", "UnknownRole"); //.detail("Request", req.printable()); + TraceEvent(SevError, "FastRestoreWorkerHandleRecruitRoleRequestUnknownRole").detail("Request", req.toString()); } return; @@ -147,7 +146,7 @@ ACTOR Future collectRestoreWorkerInterface(Reference se } break; } - TraceEvent("FastRestore") + TraceEvent("FastRestoreWorker") .suppressFor(10.0) .detail("NotEnoughWorkers", agentValues.size()) .detail("MinWorkers", min_num_workers); @@ -158,7 +157,7 @@ ACTOR Future collectRestoreWorkerInterface(Reference se } ASSERT(agents.size() >= min_num_workers); // ASSUMPTION: We must have at least 1 loader and 1 applier - TraceEvent("FastRestore").detail("CollectWorkerInterfaceNumWorkers", self->workerInterfaces.size()); + TraceEvent("FastRestoreWorker").detail("CollectWorkerInterfaceNumWorkers", self->workerInterfaces.size()); return Void(); } @@ -182,12 +181,12 @@ ACTOR Future monitorWorkerLiveness(Reference self) { ACTOR Future startRestoreWorkerLeader(Reference self, RestoreWorkerInterface workerInterf, Database cx) { // We must wait for enough time to make sure all restore workers have registered their workerInterfaces into the DB - TraceEvent("FastRestore") + TraceEvent("FastRestoreWorker") .detail("Master", workerInterf.id()) .detail("WaitForRestoreWorkerInterfaces", SERVER_KNOBS->FASTRESTORE_NUM_LOADERS + SERVER_KNOBS->FASTRESTORE_NUM_APPLIERS); wait(delay(10.0)); - TraceEvent("FastRestore") + TraceEvent("FastRestoreWorker") .detail("Master", workerInterf.id()) .detail("CollectRestoreWorkerInterfaces", SERVER_KNOBS->FASTRESTORE_NUM_LOADERS + SERVER_KNOBS->FASTRESTORE_NUM_APPLIERS); @@ -236,13 +235,13 @@ ACTOR Future startRestoreWorker(Reference self, Restore exitRole = handlerTerminateWorkerRequest(req, self, interf, cx); } when(wait(exitRole)) { - TraceEvent("FastRestore").detail("RestoreWorkerCore", "ExitRole").detail("NodeID", self->id()); + TraceEvent("FastRestoreWorkerCoreExitRole", self->id()); break; } } } catch (Error& e) { - TraceEvent(SevWarn, "FastRestore") - .detail("RestoreWorkerError", e.what()) + TraceEvent(SevWarn, "FastRestoreWorkerError") + .detail("Error", e.what()) .detail("RequestType", requestTypeStr); break; }