From 3b7c0362a8592d439b5b242eee5fbee583a9b6c4 Mon Sep 17 00:00:00 2001
From: Dmitrii Stepanov <d.stepanov@yadro.com>
Date: Tue, 12 Dec 2023 14:18:42 +0300
Subject: [PATCH] [#861] shard: Fix Delete object
It is possible that object doesn't exist in metabase.
Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
---
internal/logs/logs.go | 1 +
pkg/local_object_storage/shard/delete.go | 29 ++++++++++++++++++++++--
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/internal/logs/logs.go b/internal/logs/logs.go
index befa7342a..c996e830a 100644
--- a/internal/logs/logs.go
+++ b/internal/logs/logs.go
@@ -553,4 +553,5 @@ const (
BlobovniczaSavingCountersToMeta = "saving counters to blobovnicza's meta..."
BlobovniczaSavingCountersToMetaSuccess = "saving counters to blobovnicza's meta completed successfully"
BlobovniczaSavingCountersToMetaFailed = "saving counters to blobovnicza's meta failed"
+ ObjectRemovalFailureExistsInWritecache = "can't remove object: object must be flushed from writecache"
)
diff --git a/pkg/local_object_storage/shard/delete.go b/pkg/local_object_storage/shard/delete.go
index 0856bda10..1c510bdb7 100644
--- a/pkg/local_object_storage/shard/delete.go
+++ b/pkg/local_object_storage/shard/delete.go
@@ -2,12 +2,14 @@ package shard
import (
"context"
+ "fmt"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common"
meta "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase"
tracingPkg "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/tracing"
"git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
+ "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/trace"
@@ -61,6 +63,13 @@ func (s *Shard) delete(ctx context.Context, prm DeletePrm, skipFailed bool) (Del
default:
}
+ if err := s.validateWritecacheDoesntContainObject(ctx, addr); err != nil {
+ if skipFailed {
+ continue
+ }
+ return result, err
+ }
+
if err := s.deleteFromBlobstor(ctx, addr); err != nil {
if skipFailed {
continue
@@ -80,6 +89,21 @@ func (s *Shard) delete(ctx context.Context, prm DeletePrm, skipFailed bool) (Del
return result, nil
}
+func (s *Shard) validateWritecacheDoesntContainObject(ctx context.Context, addr oid.Address) error {
+ if !s.hasWriteCache() {
+ return nil
+ }
+ _, err := s.writeCache.Head(ctx, addr)
+ if err == nil {
+ s.log.Warn(logs.ObjectRemovalFailureExistsInWritecache, zap.Stringer("object_address", addr))
+ return fmt.Errorf("object %s must be flushed from writecache", addr)
+ }
+ if client.IsErrObjectNotFound(err) {
+ return nil
+ }
+ return err
+}
+
func (s *Shard) deleteFromBlobstor(ctx context.Context, addr oid.Address) error {
var sPrm meta.StorageIDPrm
sPrm.SetAddress(addr)
@@ -99,13 +123,14 @@ func (s *Shard) deleteFromBlobstor(ctx context.Context, addr oid.Address) error
delPrm.StorageID = storageID
_, err = s.blobStor.Delete(ctx, delPrm)
- if err != nil {
+ if err != nil && !client.IsErrObjectNotFound(err) {
s.log.Debug(logs.ObjectRemovalFailureBlobStor,
zap.Stringer("object_address", addr),
zap.String("error", err.Error()),
zap.String("trace_id", tracingPkg.GetTraceID(ctx)))
+ return err
}
- return err
+ return nil
}
func (s *Shard) deleteFromMetabase(ctx context.Context, addr oid.Address) error {