Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify engine interface #3008

Merged
merged 16 commits into from
Nov 12, 2024
Merged

Simplify engine interface #3008

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
28e4394
engine: drop useless Prm/Res from container APIs
roman-khimov Nov 11, 2024
4b6d39e
engine: drop Prm/Res from delete APIs
roman-khimov Nov 11, 2024
3701d2d
engine: simplify Evacuate interface
roman-khimov Nov 11, 2024
ccbacc3
engine: simplify FlushWriteCache interface
roman-khimov Nov 11, 2024
b919df4
shard: simplify Get interface
roman-khimov Nov 11, 2024
2fb0906
engine: simplify GetRange interface
roman-khimov Nov 11, 2024
ea5c6db
engine: simplify Head interface
roman-khimov Nov 11, 2024
fa47327
node: force removal of redundant object copy
roman-khimov Nov 11, 2024
e012d78
engine: deduplicate deleteObj/inhume code
roman-khimov Nov 11, 2024
a6b3181
*: use engine.Delete instead of engine.Inhume where appropriate
roman-khimov Nov 11, 2024
8d166aa
engine: drop MarkAsGarbage from the InhumePrm
roman-khimov Nov 11, 2024
c73ab95
engine: simplify Inhume() interface
roman-khimov Nov 11, 2024
2e2042b
engine: simplify List*/Select interfaces
roman-khimov Nov 11, 2024
88a3774
engine: simplify Put interface
roman-khimov Nov 11, 2024
8d91f82
engine: move metrics collection into entry methods
roman-khimov Nov 11, 2024
e482dbf
engine: drop package-level wrappers over StorageEngine
roman-khimov Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions cmd/neofs-node/object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,7 @@ func initObjectService(c *cfg) {
policer.WithHeadTimeout(c.applicationConfiguration.policer.headTimeout),
policer.WithReplicator(c.replicator),
policer.WithRedundantCopyCallback(func(addr oid.Address) {
var inhumePrm engine.InhumePrm
inhumePrm.MarkAsGarbage(addr)
inhumePrm.WithForceRemoval()

_, err := ls.Inhume(inhumePrm)
err := ls.Delete(addr)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now, there is more than one thing that can delete objects, not sure it is expected. GC can be controlled, GC can be tuned or even stopped to prevent unnecessary disk load (#2992) but with this PR there is also a policer that does things on its own

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It did the same thing previously. The only difference is force, that's fa47327.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i meant deletion through the garbage bucket is more predictable to me. looking at this change makes me think we do not need the garbage bucket at all then

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The logic is the same, at least.

if err != nil {
c.log.Warn("could not inhume mark redundant copy as garbage",
zap.String("error", err.Error()),
Expand Down
7 changes: 1 addition & 6 deletions pkg/services/policer/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (

"github.com/nspcc-dev/neofs-node/pkg/core/container"
objectcore "github.com/nspcc-dev/neofs-node/pkg/core/object"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine"
headsvc "github.com/nspcc-dev/neofs-node/pkg/services/object/head"
"github.com/nspcc-dev/neofs-node/pkg/services/replicator"
apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
Expand Down Expand Up @@ -88,11 +87,7 @@ func (p *Policer) processObject(ctx context.Context, addrWithType objectcore.Add
zap.String("error", err.Error()),
)
if container.IsErrNotFound(err) {
var prm engine.InhumePrm
prm.MarkAsGarbage(addrWithType.Address)
prm.WithForceRemoval()

_, err := p.jobQueue.localStorage.Inhume(prm)
err = p.jobQueue.localStorage.Delete(addrWithType.Address)
if err != nil {
p.log.Error("could not inhume object with missing container",
zap.Stringer("cid", idCnr),
Expand Down