From d2084ece413ceb80a98bdf1bf96b0af91c82b8ac Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Fri, 25 Aug 2023 10:43:49 +0300 Subject: [PATCH] [#648] objsvc/delete: Remove redundant logs We never propagate delete requests to the container node, because tombstone broadcast is done via PUT. No need to pollute logs. Signed-off-by: Evgenii Stratonikov --- internal/logs/logs.go | 1 - pkg/services/object/delete/container.go | 7 ------- pkg/services/object/delete/delete.go | 10 ++-------- 3 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 pkg/services/object/delete/container.go diff --git a/internal/logs/logs.go b/internal/logs/logs.go index 3f0a3f56e..a94e868f2 100644 --- a/internal/logs/logs.go +++ b/internal/logs/logs.go @@ -82,7 +82,6 @@ const ( PersistentCouldNotCleanUpExpiredTokens = "could not clean up expired tokens" ControllerReportIsAlreadyStarted = "report is already started" TombstoneCouldNotGetTheTombstoneTheSource = "tombstone getter: could not get the tombstone the source" - DeleteRequestIsNotRolledOverToTheContainer = "request is not rolled over to the container" DeleteCouldNotComposeSplitInfo = "could not compose split info" DeleteNoSplitInfoObjectIsPHY = "no split info, object is PHY" DeleteAssemblingChain = "assembling chain..." diff --git a/pkg/services/object/delete/container.go b/pkg/services/object/delete/container.go deleted file mode 100644 index 3106d8efd..000000000 --- a/pkg/services/object/delete/container.go +++ /dev/null @@ -1,7 +0,0 @@ -package deletesvc - -import "git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs" - -func (exec *execCtx) executeOnContainer() { - exec.log.Debug(logs.DeleteRequestIsNotRolledOverToTheContainer) -} diff --git a/pkg/services/object/delete/delete.go b/pkg/services/object/delete/delete.go index ebc191538..cf07875a8 100644 --- a/pkg/services/object/delete/delete.go +++ b/pkg/services/object/delete/delete.go @@ -39,11 +39,10 @@ func (exec *execCtx) execute(ctx context.Context) { // perform local operation exec.executeLocal(ctx) - - exec.analyzeStatus(true) + exec.analyzeStatus() } -func (exec *execCtx) analyzeStatus(execCnr bool) { +func (exec *execCtx) analyzeStatus() { // analyze local result switch exec.status { case statusOK: @@ -52,10 +51,5 @@ func (exec *execCtx) analyzeStatus(execCnr bool) { exec.log.Debug(logs.OperationFinishedWithError, zap.String("error", exec.err.Error()), ) - - if execCnr { - exec.executeOnContainer() - exec.analyzeStatus(false) - } } }