From 8ffc2fdf5ed42f0f5c49e5f48488dccbdc0efd36 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Sat, 30 Jul 2022 07:31:13 +0300 Subject: [PATCH] [#1642] engine: Do not increase error counter if the pilorama is disabled After a4adb79db new logical error could be returned. Do not increase error counter in this case. Signed-off-by: Evgenii Stratonikov --- pkg/local_object_storage/engine/tree.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkg/local_object_storage/engine/tree.go b/pkg/local_object_storage/engine/tree.go index fbc4e27c6..e0add8565 100644 --- a/pkg/local_object_storage/engine/tree.go +++ b/pkg/local_object_storage/engine/tree.go @@ -18,7 +18,7 @@ func (e *StorageEngine) TreeMove(d pilorama.CIDDescriptor, treeID string, m *pil for _, sh := range e.sortShardsByWeight(d.CID) { lm, err = sh.TreeMove(d, treeID, m) if err != nil { - if errors.Is(err, shard.ErrReadOnlyMode) { + if errors.Is(err, shard.ErrReadOnlyMode) || err == shard.ErrPiloramaDisabled { return nil, err } e.reportShardError(sh, "can't perform `TreeMove`", err, @@ -38,7 +38,7 @@ func (e *StorageEngine) TreeAddByPath(d pilorama.CIDDescriptor, treeID string, a for _, sh := range e.sortShardsByWeight(d.CID) { lm, err = sh.TreeAddByPath(d, treeID, attr, path, m) if err != nil { - if errors.Is(err, shard.ErrReadOnlyMode) { + if errors.Is(err, shard.ErrReadOnlyMode) || err == shard.ErrPiloramaDisabled { return nil, err } e.reportShardError(sh, "can't perform `TreeAddByPath`", err, @@ -57,7 +57,7 @@ func (e *StorageEngine) TreeApply(d pilorama.CIDDescriptor, treeID string, m *pi for _, sh := range e.sortShardsByWeight(d.CID) { err = sh.TreeApply(d, treeID, m) if err != nil { - if errors.Is(err, shard.ErrReadOnlyMode) { + if errors.Is(err, shard.ErrReadOnlyMode) || err == shard.ErrPiloramaDisabled { return err } e.reportShardError(sh, "can't perform `TreeApply`", err, @@ -78,6 +78,9 @@ func (e *StorageEngine) TreeGetByPath(cid cidSDK.ID, treeID string, attr string, for _, sh := range e.sortShardsByWeight(cid) { nodes, err = sh.TreeGetByPath(cid, treeID, attr, path, latest) if err != nil { + if err == shard.ErrPiloramaDisabled { + break + } if !errors.Is(err, pilorama.ErrTreeNotFound) { e.reportShardError(sh, "can't perform `TreeGetByPath`", err, zap.Stringer("cid", cid), @@ -98,6 +101,9 @@ func (e *StorageEngine) TreeGetMeta(cid cidSDK.ID, treeID string, nodeID piloram for _, sh := range e.sortShardsByWeight(cid) { m, p, err = sh.TreeGetMeta(cid, treeID, nodeID) if err != nil { + if err == shard.ErrPiloramaDisabled { + break + } if !errors.Is(err, pilorama.ErrTreeNotFound) { e.reportShardError(sh, "can't perform `TreeGetMeta`", err, zap.Stringer("cid", cid), @@ -117,6 +123,9 @@ func (e *StorageEngine) TreeGetChildren(cid cidSDK.ID, treeID string, nodeID pil for _, sh := range e.sortShardsByWeight(cid) { nodes, err = sh.TreeGetChildren(cid, treeID, nodeID) if err != nil { + if err == shard.ErrPiloramaDisabled { + break + } if !errors.Is(err, pilorama.ErrTreeNotFound) { e.reportShardError(sh, "can't perform `TreeGetChildren`", err, zap.Stringer("cid", cid), @@ -136,6 +145,9 @@ func (e *StorageEngine) TreeGetOpLog(cid cidSDK.ID, treeID string, height uint64 for _, sh := range e.sortShardsByWeight(cid) { lm, err = sh.TreeGetOpLog(cid, treeID, height) if err != nil { + if err == shard.ErrPiloramaDisabled { + break + } if !errors.Is(err, pilorama.ErrTreeNotFound) { e.reportShardError(sh, "can't perform `TreeGetOpLog`", err, zap.Stringer("cid", cid),