From 67981f002fae229cbd54e01440740b4b130f91e1 Mon Sep 17 00:00:00 2001 From: Scott Schurr Date: Tue, 7 Apr 2020 14:36:06 -0700 Subject: [PATCH] Reduce strand re-execute log message severity to warning: Historically strand re-execute log messages have been treated as errors. However in the vast majority of cases these log messages are caused by well understood mechanics in the payment engine. So usually these log messages should be treated as warnings. --- src/ripple/app/paths/impl/BookStep.cpp | 2 +- src/ripple/app/paths/impl/DirectStep.cpp | 4 ++-- src/ripple/app/paths/impl/StrandFlow.h | 2 +- src/ripple/app/paths/impl/XRPEndpointStep.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ripple/app/paths/impl/BookStep.cpp b/src/ripple/app/paths/impl/BookStep.cpp index fd85f91f00..d0bbca0e66 100644 --- a/src/ripple/app/paths/impl/BookStep.cpp +++ b/src/ripple/app/paths/impl/BookStep.cpp @@ -964,7 +964,7 @@ BookStep::validFwd ( if (!(checkNear (savCache.in, cache_->in) && checkNear (savCache.out, cache_->out))) { - JLOG (j_.error()) << + JLOG (j_.warn()) << "Strand re-execute check failed." << " ExpectedIn: " << to_string (savCache.in) << " CachedIn: " << to_string (cache_->in) << diff --git a/src/ripple/app/paths/impl/DirectStep.cpp b/src/ripple/app/paths/impl/DirectStep.cpp index 92d600c987..2d2e174ddd 100644 --- a/src/ripple/app/paths/impl/DirectStep.cpp +++ b/src/ripple/app/paths/impl/DirectStep.cpp @@ -725,7 +725,7 @@ DirectStepI::validFwd ( if (maxSrcToDst < cache_->srcToDst) { - JLOG (j_.error()) << + JLOG (j_.warn()) << "DirectStepI: Strand re-execute check failed." << " Exceeded max src->dst limit" << " max src->dst: " << to_string (maxSrcToDst) << @@ -736,7 +736,7 @@ DirectStepI::validFwd ( if (!(checkNear (savCache.in, cache_->in) && checkNear (savCache.out, cache_->out))) { - JLOG (j_.error()) << + JLOG (j_.warn()) << "DirectStepI: Strand re-execute check failed." << " ExpectedIn: " << to_string (savCache.in) << " CachedIn: " << to_string (cache_->in) << diff --git a/src/ripple/app/paths/impl/StrandFlow.h b/src/ripple/app/paths/impl/StrandFlow.h index 7e217eb78d..44400ff89e 100644 --- a/src/ripple/app/paths/impl/StrandFlow.h +++ b/src/ripple/app/paths/impl/StrandFlow.h @@ -251,7 +251,7 @@ flow ( strand[i]->validFwd (checkSB, checkAfView, stepIn); if (!valid) { - JLOG (j.error()) + JLOG (j.warn()) << "Strand re-execute check failed. Step: " << i; break; } diff --git a/src/ripple/app/paths/impl/XRPEndpointStep.cpp b/src/ripple/app/paths/impl/XRPEndpointStep.cpp index d30bd1887f..5eed536fba 100644 --- a/src/ripple/app/paths/impl/XRPEndpointStep.cpp +++ b/src/ripple/app/paths/impl/XRPEndpointStep.cpp @@ -315,7 +315,7 @@ XRPEndpointStep::validFwd ( if (!isLast_ && balance < xrpIn) { - JLOG (j_.error()) << "XRPEndpointStep: Strand re-execute check failed." + JLOG (j_.warn()) << "XRPEndpointStep: Strand re-execute check failed." << " Insufficient balance: " << to_string (balance) << " Requested: " << to_string (xrpIn); return {false, EitherAmount (balance)}; @@ -323,7 +323,7 @@ XRPEndpointStep::validFwd ( if (xrpIn != *cache_) { - JLOG (j_.error()) << "XRPEndpointStep: Strand re-execute check failed." + JLOG (j_.warn()) << "XRPEndpointStep: Strand re-execute check failed." << " ExpectedIn: " << to_string (*cache_) << " CachedIn: " << to_string (xrpIn); }