realloc/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Releases Packages Activity

[#1681] node: Block only Object service ops under maintenance

Browse source 
In previous implementation node blocked any operation of local object
storage in maintenance mode. There is a need to perform some storage
operations like data evacuation or restoration.

Do not call block storage engine in maintenance mode. Make all Object
service operations to return `apistatus.NodeUnderMaintenance` error from
each local op.

Signed-off-by: Leonard Lyubich <ctulhurider@gmail.com>
This commit is contained in:
Leonard Lyubich 2022-10-04 17:01:16 +04:00 • committed by fyrchik
parent 082602b668
commit 713aea06fa
8 changed files with 86 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pkg/services/object/search/service.go
View file

@ -81,9 +81,12 @@ func WithLogger(l *logger.Logger) Option {
// WithLocalStorageEngine returns option to set local storage
// instance.
func WithLocalStorageEngine(e *engine.StorageEngine) Option {
func WithLocalStorageEngine(e *engine.StorageEngine, state util.NodeState) Option {
return func(c *cfg) {
c.localStorage = (*storageEngineWrapper)(e)
c.localStorage = &storageEngineWrapper{
state: state,
storage: e,
}
}
}

14
pkg/services/object/search/util.go
View file

@ -9,6 +9,7 @@ import (
internalclient "github.com/nspcc-dev/neofs-node/pkg/services/object/internal/client"
"github.com/nspcc-dev/neofs-node/pkg/services/object/util"
"github.com/nspcc-dev/neofs-node/pkg/services/object_manager/placement"
apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
)
@ -29,7 +30,11 @@ type clientWrapper struct {
client client.MultiAddressClient
}
type storageEngineWrapper engine.StorageEngine
type storageEngineWrapper struct {
state util.NodeState
storage *engine.StorageEngine
}
type traverseGeneratorWrapper util.TraverserGenerator
@ -120,11 +125,16 @@ func (c *clientWrapper) searchObjects(exec *execCtx, info client.NodeInfo) ([]oi
}
func (e *storageEngineWrapper) search(exec *execCtx) ([]oid.ID, error) {
if e.state != nil && e.state.IsMaintenance() {
var st apistatus.NodeUnderMaintenance
return nil, st
}
var selectPrm engine.SelectPrm
selectPrm.WithFilters(exec.searchFilters())
selectPrm.WithContainerID(exec.containerID())
r, err := (*engine.StorageEngine)(e).Select(selectPrm)
r, err := e.storage.Select(selectPrm)
if err != nil {
return nil, err
}