forked from TrueCloudLab/frostfs-node
Revert "[#446] engine: Move to read-only on blobstor errors"
This reverts commit 69df0d21c2
.
Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
parent
942d83611b
commit
f23e38c285
2 changed files with 15 additions and 21 deletions
|
@ -8,7 +8,6 @@ import (
|
||||||
|
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
|
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container"
|
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container"
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
|
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard"
|
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard"
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode"
|
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode"
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr"
|
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr"
|
||||||
|
@ -50,7 +49,6 @@ type shardWrapper struct {
|
||||||
|
|
||||||
type setModeRequest struct {
|
type setModeRequest struct {
|
||||||
sh *shard.Shard
|
sh *shard.Shard
|
||||||
isMeta bool
|
|
||||||
errorCount uint32
|
errorCount uint32
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -76,7 +74,7 @@ func (e *StorageEngine) setModeLoop() {
|
||||||
if !ok {
|
if !ok {
|
||||||
inProgress[sid] = struct{}{}
|
inProgress[sid] = struct{}{}
|
||||||
go func() {
|
go func() {
|
||||||
e.moveToDegraded(r.sh, r.errorCount, r.isMeta)
|
e.moveToDegraded(r.sh, r.errorCount)
|
||||||
|
|
||||||
mtx.Lock()
|
mtx.Lock()
|
||||||
delete(inProgress, sid)
|
delete(inProgress, sid)
|
||||||
|
@ -88,7 +86,7 @@ func (e *StorageEngine) setModeLoop() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *StorageEngine) moveToDegraded(sh *shard.Shard, errCount uint32, isMeta bool) {
|
func (e *StorageEngine) moveToDegraded(sh *shard.Shard, errCount uint32) {
|
||||||
sid := sh.ID()
|
sid := sh.ID()
|
||||||
log := e.log.With(
|
log := e.log.With(
|
||||||
zap.Stringer("shard_id", sid),
|
zap.Stringer("shard_id", sid),
|
||||||
|
@ -97,24 +95,22 @@ func (e *StorageEngine) moveToDegraded(sh *shard.Shard, errCount uint32, isMeta
|
||||||
e.mtx.RLock()
|
e.mtx.RLock()
|
||||||
defer e.mtx.RUnlock()
|
defer e.mtx.RUnlock()
|
||||||
|
|
||||||
if isMeta {
|
|
||||||
err := sh.SetMode(mode.DegradedReadOnly)
|
err := sh.SetMode(mode.DegradedReadOnly)
|
||||||
if err == nil {
|
if err != nil {
|
||||||
log.Info(logs.EngineShardIsMovedInDegradedModeDueToErrorThreshold)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
log.Error(logs.EngineFailedToMoveShardInDegradedreadonlyModeMovingToReadonly,
|
log.Error(logs.EngineFailedToMoveShardInDegradedreadonlyModeMovingToReadonly,
|
||||||
zap.Error(err))
|
zap.Error(err))
|
||||||
}
|
|
||||||
|
|
||||||
err := sh.SetMode(mode.ReadOnly)
|
err = sh.SetMode(mode.ReadOnly)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error(logs.EngineFailedToMoveShardInReadonlyMode, zap.Error(err))
|
log.Error(logs.EngineFailedToMoveShardInReadonlyMode,
|
||||||
return
|
zap.Error(err))
|
||||||
}
|
} else {
|
||||||
|
|
||||||
log.Info(logs.EngineShardIsMovedInReadonlyModeDueToErrorThreshold)
|
log.Info(logs.EngineShardIsMovedInReadonlyModeDueToErrorThreshold)
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
log.Info(logs.EngineShardIsMovedInDegradedModeDueToErrorThreshold)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// reportShardErrorBackground increases shard error counter and logs an error.
|
// reportShardErrorBackground increases shard error counter and logs an error.
|
||||||
// It is intended to be used from background workers and
|
// It is intended to be used from background workers and
|
||||||
|
@ -179,13 +175,11 @@ func (e *StorageEngine) reportShardErrorWithFlags(
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
isMeta := errors.As(err, new(metaerr.Error))
|
|
||||||
if block {
|
if block {
|
||||||
e.moveToDegraded(sh, errCount, isMeta)
|
e.moveToDegraded(sh, errCount)
|
||||||
} else {
|
} else {
|
||||||
req := setModeRequest{
|
req := setModeRequest{
|
||||||
errorCount: errCount,
|
errorCount: errCount,
|
||||||
isMeta: isMeta,
|
|
||||||
sh: sh,
|
sh: sh,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -153,7 +153,7 @@ func TestErrorReporting(t *testing.T) {
|
||||||
for i := uint32(0); i < 2; i++ {
|
for i := uint32(0); i < 2; i++ {
|
||||||
_, err = te.ng.Get(context.Background(), GetPrm{addr: object.AddressOf(obj)})
|
_, err = te.ng.Get(context.Background(), GetPrm{addr: object.AddressOf(obj)})
|
||||||
require.Error(t, err)
|
require.Error(t, err)
|
||||||
checkShardState(t, te.ng, te.shards[0].id, errThreshold+i, mode.ReadOnly)
|
checkShardState(t, te.ng, te.shards[0].id, errThreshold+i, mode.DegradedReadOnly)
|
||||||
checkShardState(t, te.ng, te.shards[1].id, 0, mode.ReadWrite)
|
checkShardState(t, te.ng, te.shards[1].id, 0, mode.ReadWrite)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue