Skip to content

GO-6945 spacedeleter: ignore already removed spaces #215

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 27, 2026
Merged

GO-6945 spacedeleter: ignore already removed spaces #215

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
16 changes: 15 additions & 1 deletion nodespace/spacedeleter/spacedeleter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func (s *spaceDeleter) delete(ctx context.Context) (err error) {
}

func (s *spaceDeleter) processDeletionRecord(ctx context.Context, rec *coordinatorproto.DeletionLogRecord) (err error) {
log := log.With(zap.String("spaceId", rec.SpaceId))
log := log.With(zap.String("spaceId", rec.SpaceId), zap.String("deletionLogId", rec.Id), zap.String("status", rec.Status.String()))
deleteSpace := func() error {
// deleting space storage
err = s.storageProvider.DeleteSpaceStorage(ctx, rec.SpaceId)
Expand All @@ -119,6 +119,20 @@ func (s *spaceDeleter) processDeletionRecord(ctx context.Context, rec *coordinat
}
return s.deletionStorage.SetSpaceStatus(ctx, rec.SpaceId, nodestorage.SpaceStatusRemove, rec.Id)
}

prevStatus, err := s.deletionStorage.SpaceStatus(ctx, rec.SpaceId)
if err != nil {
return err
}
if prevStatus == nodestorage.SpaceStatusRemove {
log.Debug("space is already removed")
err := s.deletionStorage.SetDeletionLogId(ctx, rec.Id)
if err != nil {
return err
}
return nil
}

switch rec.Status {
case coordinatorproto.DeletionLogRecordStatus_Ok:
log.Debug("received deletion cancel record")
Expand Down
4 changes: 2 additions & 2 deletions nodespace/spacedeleter/spacedeleter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func TestSpaceDeleter_Run_Ok(t *testing.T) {
assert.Equal(t, []string{"space1"}, allIds)
}

func TestSpaceDeleter_Run_Ok_NewPush(t *testing.T) {
func TestSpaceDeleter_Run_Remove_Ok(t *testing.T) {
fx := newSpaceDeleterFixture(t)
defer fx.stop(t)
fx.nodeConf.EXPECT().IsResponsible(gomock.Any()).Return(true).AnyTimes()
Expand All @@ -81,7 +81,7 @@ func TestSpaceDeleter_Run_Ok_NewPush(t *testing.T) {
require.Equal(t, lg[3].Id, id)
status, err := fx.storage.IndexStorage().SpaceStatus(ctx, payload.SpaceHeaderWithId.Id)
require.NoError(t, err)
require.Equal(t, nodestorage.SpaceStatusOk, status)
require.Equal(t, nodestorage.SpaceStatusRemove, status)
}

func TestSpaceDeleter_Run_Ok_NotResponsible(t *testing.T) {
Expand Down