Skip to content

GO-6761 deletion log: handle ownership transfer changes #211

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

Merged
cheggaaa merged 1 commit into from
Feb 10, 2026
Merged

GO-6761 deletion log: handle ownership transfer changes #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions nodespace/spacedeleter/spacedeleter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ func (s *spaceDeleter) delete(ctx context.Context) (err error) {
case <-ctx.Done():
return ctx.Err()
}
lastRecordId, err := s.deletionStorage.LastRecordId(ctx)
if err != nil && !errors.Is(err, nodestorage.ErrNoLastRecordId) {
lastRecordId, err := s.deletionStorage.DeletionLogId(ctx)
if err != nil && !errors.Is(err, nodestorage.ErrNoDeletionLogId) {
return err
}
log.Debug("getting deletion log", zap.Int("limit", logLimit), zap.String("lastRecordId", lastRecordId))
Expand Down Expand Up @@ -135,6 +135,12 @@ func (s *spaceDeleter) processDeletionRecord(ctx context.Context, rec *coordinat
if err != nil {
return err
}
case coordinatorproto.DeletionLogRecordStatus_OwnershipChange:
log.Debug("received ownership change record")
err := s.deletionStorage.SetDeletionLogId(ctx, rec.Id)
if err != nil {
return err
}
}
return nil
}
8 changes: 4 additions & 4 deletions nodespace/spacedeleter/spacedeleter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func TestSpaceDeleter_Run_Ok(t *testing.T) {
close(fx.waiterChan)
<-fx.deleter.testChan

id, err := fx.storage.IndexStorage().LastRecordId(ctx)
id, err := fx.storage.IndexStorage().DeletionLogId(ctx)
require.NoError(t, err)
require.Equal(t, lg[2].Id, id)
store, err = fx.storage.WaitSpaceStorage(ctx, payload.SpaceHeaderWithId.Id)
Expand Down Expand Up @@ -72,7 +72,7 @@ func TestSpaceDeleter_Run_Ok_NewPush(t *testing.T) {
close(fx.waiterChan)
<-fx.deleter.testChan

id, err := fx.storage.IndexStorage().LastRecordId(ctx)
id, err := fx.storage.IndexStorage().DeletionLogId(ctx)
require.NoError(t, err)
require.Equal(t, lg[3].Id, id)
status, err := fx.storage.IndexStorage().SpaceStatus(ctx, payload.SpaceHeaderWithId.Id)
Expand All @@ -90,7 +90,7 @@ func TestSpaceDeleter_Run_Ok_NoStorage(t *testing.T) {
close(fx.waiterChan)
<-fx.deleter.testChan

id, err := fx.storage.IndexStorage().LastRecordId(ctx)
id, err := fx.storage.IndexStorage().DeletionLogId(ctx)
require.NoError(t, err)
require.Equal(t, lg[2].Id, id)
status, err := fx.storage.IndexStorage().SpaceStatus(ctx, "space3")
Expand Down Expand Up @@ -130,7 +130,7 @@ func TestSpaceDeleter_Run_Ok_EmptyStorage(t *testing.T) {
close(fx.waiterChan)
<-fx.deleter.testChan

id, err := fx.storage.IndexStorage().LastRecordId(ctx)
id, err := fx.storage.IndexStorage().DeletionLogId(ctx)
require.NoError(t, err)
require.Equal(t, lg[2].Id, id)
store, err = fx.storage.WaitSpaceStorage(context.Background(), payload.SpaceHeaderWithId.Id)
Expand Down
23 changes: 18 additions & 5 deletions nodestorage/indexstorage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ const (
)

var (
ErrUnknownSpaceId = errors.New("unknown space id")
ErrNoLastRecordId = errors.New("no last record id")
ErrUnknownSpaceId = errors.New("unknown space id")
ErrNoDeletionLogId = errors.New("no last record id")
)

const (
Expand Down Expand Up @@ -57,7 +57,8 @@ type IndexStorage interface {
SpaceStatus(ctx context.Context, spaceId string) (status SpaceStatus, err error)
MarkArchived(ctx context.Context, spaceId string, compressedSize, uncompressedSize int64) (err error)
MarkError(ctx context.Context, spaceId string, errString string) (err error)
LastRecordId(ctx context.Context) (id string, err error)
DeletionLogId(ctx context.Context) (id string, err error)
SetDeletionLogId(ctx context.Context, id string) (err error)
FindOldestInactiveSpace(ctx context.Context, olderThan time.Duration, skip int) (spaceId string, err error)

UpdateLastAccess(ctx context.Context, spaceId string) (err error)
Expand Down Expand Up @@ -205,17 +206,29 @@ func (d *indexStorage) MarkArchived(ctx context.Context, spaceId string, compres
return err
}

func (d *indexStorage) LastRecordId(ctx context.Context) (id string, err error) {
func (d *indexStorage) DeletionLogId(ctx context.Context) (id string, err error) {
doc, err := d.settingsColl.FindId(ctx, lastDeletionIdKey)
if err != nil {
if errors.Is(err, anystore.ErrDocNotFound) {
return "", ErrNoLastRecordId
return "", ErrNoDeletionLogId
}
return "", err
}
return doc.Value().GetString(valueKey), nil
}

func (d *indexStorage) SetDeletionLogId(ctx context.Context, id string) (err error) {
_, err = d.settingsColl.UpsertId(ctx, lastDeletionIdKey, query.ModifyFunc(func(a *anyenc.Arena, v *anyenc.Value) (result *anyenc.Value, modified bool, err error) {
prevKey := v.GetString(valueKey)
if prevKey < id {
v.Set(valueKey, a.NewString(id))
return v, true, nil
}
return v, false, nil
}))
return
}

func (d *indexStorage) UpdateLastAccess(ctx context.Context, spaceId string) (err error) {
now := time.Now()
if val, ok := d.lastAccessCache.Load(spaceId); ok {
Expand Down
44 changes: 29 additions & 15 deletions nodestorage/mock_nodestorage/mock_nodestorage.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.