TrueCloudLab/frostfs-node
21
1
Fork 27
Code Issues 108 Pull requests 3 Projects Releases 1 Activity Actions

[#1086] engine: Change mode in case of errors async

Browse source 
Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
Dmitrii Stepanov 2024-04-10 11:49:31 +03:00 committed by Evgenii Stratonikov
parent 5ef5734c4e
commit 40781b3a20
2 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkg/local_object_storage/engine/engine.go
View file

@ -133,7 +133,7 @@ func (e *StorageEngine) reportShardErrorBackground(id string, msg string, err er
errCount := sh.errorCount.Add(1) errCount := sh.errorCount.Add(1)
sh.Shard.IncErrorCounter() sh.Shard.IncErrorCounter()
e.reportShardErrorWithFlags(sh.Shard, errCount, false, msg, err) e.reportShardErrorWithFlags(sh.Shard, errCount, msg, err)
} }
// reportShardError checks that the amount of errors doesn't exceed the configured threshold. // reportShardError checks that the amount of errors doesn't exceed the configured threshold.
@ -153,13 +153,12 @@ func (e *StorageEngine) reportShardError(
errCount := sh.errorCount.Add(1) errCount := sh.errorCount.Add(1)
sh.Shard.IncErrorCounter() sh.Shard.IncErrorCounter()
e.reportShardErrorWithFlags(sh.Shard, errCount, true, msg, err, fields...) e.reportShardErrorWithFlags(sh.Shard, errCount, msg, err, fields...)
} }
func (e *StorageEngine) reportShardErrorWithFlags( func (e *StorageEngine) reportShardErrorWithFlags(
sh *shard.Shard, sh *shard.Shard,
errCount uint32, errCount uint32,
block bool,
msg string, msg string,
err error, err error,
fields ...zap.Field, fields ...zap.Field,
@ -175,9 +174,6 @@ func (e *StorageEngine) reportShardErrorWithFlags(
return return
} }
if block {
e.moveToDegraded(sh, errCount)
} else {
req := setModeRequest{ req := setModeRequest{
errorCount: errCount, errorCount: errCount,
sh: sh, sh: sh,
@ -193,7 +189,6 @@ func (e *StorageEngine) reportShardErrorWithFlags(
zap.Uint32("error_count", errCount)) zap.Uint32("error_count", errCount))
} }
} }
}
func isLogical(err error) bool { func isLogical(err error) bool {
return errors.As(err, &logicerr.Logical{}) || errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) return errors.As(err, &logicerr.Logical{}) || errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded)

7
pkg/local_object_storage/engine/error_test.go
View file

@ -7,6 +7,7 @@ import (
"path/filepath" "path/filepath"
"strconv" "strconv"
"testing" "testing"
"time"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor"
@ -229,6 +230,8 @@ func checkShardState(t *testing.T, e *StorageEngine, id *shard.ID, errCount uint
sh := e.shards[id.String()] sh := e.shards[id.String()]
e.mtx.RUnlock() e.mtx.RUnlock()
require.Equal(t, errCount, sh.errorCount.Load()) require.Eventually(t, func() bool {
require.Equal(t, mode, sh.GetMode()) return errCount == sh.errorCount.Load() &&
mode == sh.GetMode()
}, 10*time.Second, 10*time.Millisecond, "shard mode doesn't changed to expected state in 10 seconds")
} }