diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp index fbe5b55415..dc6bb0cb86 100644 --- a/fdbclient/NativeAPI.actor.cpp +++ b/fdbclient/NativeAPI.actor.cpp @@ -3351,7 +3351,7 @@ void enableClientInfoLogging() { } ACTOR Future snapshotDatabase(Reference cx, StringRef snapPayload, UID snapUID, Optional debugID) { - TraceEvent("NativeAPI.SnapshotDatabaseEnter") + TraceEvent("SnapshotDatabaseEnter") .detail("SnapPayload", snapPayload) .detail("SnapUID", snapUID); try { @@ -3368,10 +3368,10 @@ ACTOR Future snapshotDatabase(Reference cx, StringRef sna } } } catch (Error& e) { - TraceEvent("NativeAPI.SnapshotDatabaseError") + TraceEvent("SnapshotDatabaseError") + .error(e) .detail("SnapPayload", snapPayload) - .detail("SnapUID", snapUID) - .error(e, true /* includeCancelled */); + .detail("SnapUID", snapUID); throw; } return Void(); diff --git a/fdbclient/SystemData.cpp b/fdbclient/SystemData.cpp index bd85e1751e..51686bddad 100644 --- a/fdbclient/SystemData.cpp +++ b/fdbclient/SystemData.cpp @@ -36,14 +36,6 @@ const KeyRef keyServersEnd = keyServersKeys.end; const KeyRangeRef keyServersKeyServersKeys ( LiteralStringRef("\xff/keyServers/\xff/keyServers/"), LiteralStringRef("\xff/keyServers/\xff/keyServers0")); const KeyRef keyServersKeyServersKey = keyServersKeyServersKeys.begin; -// list of reserved exec commands -const StringRef execSnap = LiteralStringRef("snap"); // snapshot persistent state of - // storage, TLog and coordinated state -const StringRef execDisableTLogPop = LiteralStringRef("\xff/TLogDisablePop"); // disable pop on TLog -const StringRef execEnableTLogPop = LiteralStringRef("\xff/TLogEnablePop"); // enable pop on TLog -// used to communicate snap failures between TLog and SnapTest Workload, used only in simulator -const StringRef snapTestFailStatus = LiteralStringRef("\xff/SnapTestFailStatus/"); - const Key keyServersKey( const KeyRef& k ) { return k.withPrefix( keyServersPrefix ); } diff --git a/fdbclient/SystemData.h b/fdbclient/SystemData.h index 0b4f02727c..f4bedb8f14 100644 --- a/fdbclient/SystemData.h +++ b/fdbclient/SystemData.h @@ -287,10 +287,6 @@ extern const KeyRef rebalanceDDIgnoreKey; const Value healthyZoneValue( StringRef const& zoneId, Version version ); std::pair decodeHealthyZoneValue( ValueRef const& ); -extern const StringRef execSnap; -extern const StringRef execDisableTLogPop; -extern const StringRef execEnableTLogPop; -extern const StringRef snapTestFailStatus; // All mutations done to this range are blindly copied into txnStateStore. // Used to create artifically large txnStateStore instances in testing. diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp index 42aaf82495..4306cc0708 100644 --- a/fdbserver/DataDistribution.actor.cpp +++ b/fdbserver/DataDistribution.actor.cpp @@ -4138,7 +4138,7 @@ static std::set const& normalDataDistributorErrors() { ACTOR Future ddSnapCreateCore(DistributorSnapRequest snapReq, Reference> db ) { state Database cx = openDBOnServer(db, TaskPriority::DefaultDelay, true, true); - TraceEvent("SnapDataDistributor.SnapReqEnter") + TraceEvent("SnapDataDistributor_SnapReqEnter") .detail("SnapPayload", snapReq.snapPayload) .detail("SnapUID", snapReq.snapUID); try { @@ -4152,12 +4152,12 @@ ACTOR Future ddSnapCreateCore(DistributorSnapRequest snapReq, Reference storageWorkers = wait(getStorageWorkers(cx, db, true /* localOnly */)); - TraceEvent("SnapDataDistributor.GotStorageWorkers") + TraceEvent("SnapDataDistributor_GotStorageWorkers") .detail("SnapPayload", snapReq.snapPayload) .detail("SnapUID", snapReq.snapUID); std::vector> storageSnapReqs; @@ -4168,7 +4168,7 @@ ACTOR Future ddSnapCreateCore(DistributorSnapRequest snapReq, Reference ddSnapCreateCore(DistributorSnapRequest snapReq, Reference ddSnapCreateCore(DistributorSnapRequest snapReq, Reference coordWorkers = wait(getCoordWorkers(cx, db)); - TraceEvent("SnapDataDistributor.GotCoordWorkers") + TraceEvent("SnapDataDistributor_GotCoordWorkers") .detail("SnapPayload", snapReq.snapPayload) .detail("SnapUID", snapReq.snapUID); std::vector> coordSnapReqs; @@ -4207,11 +4207,11 @@ ACTOR Future ddSnapCreateCore(DistributorSnapRequest snapReq, Reference lastCommitUpdater(ProxyCommitData* self, PromiseStream proxySnapCreate(ProxySnapRequest snapReq, ProxyCommitData* commitData) { - TraceEvent("SnapMasterProxy.SnapReqEnter") + TraceEvent("SnapMasterProxy_SnapReqEnter") .detail("SnapPayload", snapReq.snapPayload) .detail("SnapUID", snapReq.snapUID); try { @@ -1463,7 +1463,7 @@ ACTOR Future proxySnapCreate(ProxySnapRequest snapReq, ProxyCommitData* co ExecCmdValueString execArg(snapReq.snapPayload); StringRef binPath = execArg.getBinaryPath(); if (!isWhitelisted(commitData->whitelistedBinPathVec, binPath)) { - TraceEvent("SnapMasterProxy.WhiteListCheckFailed") + TraceEvent("SnapMasterProxy_WhiteListCheckFailed") .detail("SnapPayload", snapReq.snapPayload) .detail("SnapUID", snapReq.snapUID); throw transaction_not_permitted(); @@ -1475,7 +1475,7 @@ ACTOR Future proxySnapCreate(ProxySnapRequest snapReq, ProxyCommitData* co // Currently, snapshot of old tlog generation is not // supported and hence failing the snapshot request until // cluster is fully_recovered. - TraceEvent("SnapMasterProxy.ClusterNotFullyRecovered") + TraceEvent("SnapMasterProxy_ClusterNotFullyRecovered") .detail("SnapPayload", snapReq.snapPayload) .detail("SnapUID", snapReq.snapUID); throw cluster_not_fully_recovered(); @@ -1490,7 +1490,7 @@ ACTOR Future proxySnapCreate(ProxySnapRequest snapReq, ProxyCommitData* co // FIXME: logAntiQuorum not supported, remove it later, // In version2, we probably don't need this limtiation, but this needs to be tested. if (logAntiQuorum > 0) { - TraceEvent("SnapMasterProxy.LogAnitQuorumNotSupported") + TraceEvent("SnapMasterProxy_LogAnitQuorumNotSupported") .detail("SnapPayload", snapReq.snapPayload) .detail("SnapUID", snapReq.snapUID); throw txn_exec_log_anti_quorum(); @@ -1506,7 +1506,7 @@ ACTOR Future proxySnapCreate(ProxySnapRequest snapReq, ProxyCommitData* co try { wait(throwErrorOr(ddSnapReq)); } catch (Error& e) { - TraceEvent("SnapMasterProxy.DDSnapResponseError") + TraceEvent("SnapMasterProxy_DDSnapResponseError") .detail("SnapPayload", snapReq.snapPayload) .detail("SnapUID", snapReq.snapUID) .error(e, true /*includeCancelled*/ ); @@ -1514,7 +1514,7 @@ ACTOR Future proxySnapCreate(ProxySnapRequest snapReq, ProxyCommitData* co } snapReq.reply.send(Void()); } catch (Error& e) { - TraceEvent("SnapMasterProxy.SnapReqError") + TraceEvent("SnapMasterProxy_SnapReqError") .detail("SnapPayload", snapReq.snapPayload) .detail("SnapUID", snapReq.snapUID) .error(e, true /*includeCancelled*/); @@ -1524,7 +1524,7 @@ ACTOR Future proxySnapCreate(ProxySnapRequest snapReq, ProxyCommitData* co throw e; } } - TraceEvent("SnapMasterProxy.SnapReqExit") + TraceEvent("SnapMasterProxy_SnapReqExit") .detail("SnapPayload", snapReq.snapPayload) .detail("SnapUID", snapReq.snapUID); return Void(); diff --git a/fdbserver/workloads/SnapTest.actor.cpp b/fdbserver/workloads/SnapTest.actor.cpp index 51d3a68d6f..639f5fb1d1 100644 --- a/fdbserver/workloads/SnapTest.actor.cpp +++ b/fdbserver/workloads/SnapTest.actor.cpp @@ -122,7 +122,7 @@ public: // workload functions // read the key SnapFailedTLog.$UID loop { try { - Standalone keyStr = snapTestFailStatus.withSuffix(StringRef(self->snapUID.toString())); + Standalone keyStr = LiteralStringRef("\xff/SnapTestFailStatus/").withSuffix(StringRef(self->snapUID.toString())); TraceEvent("TestKeyStr").detail("Value", keyStr); tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS); Optional val = wait(tr.get(keyStr));