From 2361acbe228febc5ec1dfde8d7a907a13dd345e1 Mon Sep 17 00:00:00 2001 From: Jingyu Zhou Date: Fri, 28 Oct 2022 11:53:25 -0700 Subject: [PATCH] Change SevWarn to SevInfo for injected errors --- fdbserver/CommitProxyServer.actor.cpp | 2 +- fdbserver/GrvProxyServer.actor.cpp | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp index 4a3d9aa829..bf25314f8e 100644 --- a/fdbserver/CommitProxyServer.actor.cpp +++ b/fdbserver/CommitProxyServer.actor.cpp @@ -829,7 +829,7 @@ ACTOR Future preresolutionProcessing(CommitBatchContext* self) { SERVER_KNOBS->PROXY_REJECT_BATCH_QUEUED_TOO_LONG && canReject(trs)) { // Disabled for the recovery transaction. otherwise, recovery can't finish and keeps doing more recoveries. CODE_PROBE(true, "Reject transactions in the batch"); - TraceEvent(SevWarnAlways, "ProxyReject", pProxyCommitData->dbgid) + TraceEvent(g_network->isSimulated() ? SevInfo : SevWarnAlways, "ProxyReject", pProxyCommitData->dbgid) .suppressFor(0.1) .detail("QDelay", queuingDelay) .detail("Transactions", trs.size()) diff --git a/fdbserver/GrvProxyServer.actor.cpp b/fdbserver/GrvProxyServer.actor.cpp index d413972e9c..ebca499738 100644 --- a/fdbserver/GrvProxyServer.actor.cpp +++ b/fdbserver/GrvProxyServer.actor.cpp @@ -446,11 +446,14 @@ void proxyGRVThresholdExceeded(const GetReadVersionRequest* req, GrvProxyStats* ++stats->txnRequestErrors; req->reply.sendError(grv_proxy_memory_limit_exceeded()); if (req->priority == TransactionPriority::IMMEDIATE) { - TraceEvent(SevWarnAlways, "ProxyGRVThresholdExceededSystem").suppressFor(60); + TraceEvent(g_network->isSimulated() ? SevInfo : SevWarnAlways, "ProxyGRVThresholdExceededSystem") + .suppressFor(60); } else if (req->priority == TransactionPriority::DEFAULT) { - TraceEvent(SevWarnAlways, "ProxyGRVThresholdExceededDefault").suppressFor(60); + TraceEvent(g_network->isSimulated() ? SevInfo : SevWarnAlways, "ProxyGRVThresholdExceededDefault") + .suppressFor(60); } else { - TraceEvent(SevWarnAlways, "ProxyGRVThresholdExceededBatch").suppressFor(60); + TraceEvent(g_network->isSimulated() ? SevInfo : SevWarnAlways, "ProxyGRVThresholdExceededBatch") + .suppressFor(60); } }