aarifullin/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#377] shard: Add Inhume parameter to mark the object as garbage

Browse source 
Implement `InhumePrm.MarkAsGarbage` method that leads to marking object as
garbage in metabase. Update `InhumePrm.WithTarget` doc indicating a conflict
with the new method.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-02-15 14:32:49 +03:00 committed by Alex Vanin
parent 30ac234c20
commit d3a0079d1d
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkg/local_object_storage/shard/inhume.go
View file

@ -17,6 +17,9 @@ type InhumeRes struct{}
// WithTarget sets object address that should be inhumed and tombstone address // WithTarget sets object address that should be inhumed and tombstone address
// as the reason for inhume operation. // as the reason for inhume operation.
//
// Arguments should not be nil.
// Should not be called along with MarkAsGarbage.
func (p *InhumePrm) WithTarget(addr, tombstone *objectSDK.Address) *InhumePrm { func (p *InhumePrm) WithTarget(addr, tombstone *objectSDK.Address) *InhumePrm {
if p != nil { if p != nil {
p.target = addr p.target = addr
@ -26,10 +29,30 @@ func (p *InhumePrm) WithTarget(addr, tombstone *objectSDK.Address) *InhumePrm {
return p return p
} }
// MarkAsGarbage marks object to be physically removed from shard.
//
// Should not be called along with WithTarget.
func (p *InhumePrm) MarkAsGarbage(addr *objectSDK.Address) *InhumePrm {
if p != nil {
p.target = addr
p.tombstone = nil
}
return p
}
// Inhume calls metabase. Inhume method to mark object as removed. It won't be // Inhume calls metabase. Inhume method to mark object as removed. It won't be
// removed physically from blobStor and metabase until `Delete` operation. // removed physically from blobStor and metabase until `Delete` operation.
func (s *Shard) Inhume(prm *InhumePrm) (*InhumeRes, error) { func (s *Shard) Inhume(prm *InhumePrm) (*InhumeRes, error) {
err := meta.Inhume(s.metaBase, prm.target, prm.tombstone) metaPrm := new(meta.InhumePrm).WithAddress(prm.target)
if prm.tombstone != nil {
metaPrm.WithTombstoneAddress(prm.tombstone)
} else {
metaPrm.WithGCMark()
}
_, err := s.metaBase.Inhume(metaPrm)
if err != nil { if err != nil {
s.log.Debug("could not mark object to delete in metabase", s.log.Debug("could not mark object to delete in metabase",
zap.String("error", err.Error()), zap.String("error", err.Error()),