Merge pull request #152 from anyproto/GO-5827-mark-space-as-deleted

GO-5827 mark space deletion

Author: cheggaaa

deletelog/deletelog.go

@@ -82,14 +82,18 @@ func (d *deleteLog) checkLog(ctx context.Context) (err error) {
 	var ok bool
 	for _, rec := range recs {
 		if rec.Status == coordinatorproto.DeletionLogRecordStatus_Remove && rec.FileGroup != "" {
-			ok, err = d.index.SpaceDelete(ctx, index.Key{
+			key := index.Key{
 				GroupId: rec.FileGroup,
 				SpaceId: rec.SpaceId,
-			})
-			if err != nil && !errors.Is(err, redis.Nil) {
+			}
+			ok, err = d.index.SpaceDelete(ctx, key)
+			if err != nil && !errors.Is(err, redis.Nil) && !errors.Is(err, index.ErrSpaceIsDeleted) {
 				return
 			}
 			handledCount++
+			if _, err = d.index.MarkSpaceAsDeleted(ctx, key); err != nil {
+				return
+			}
 			if ok {
 				deletedCount++
 			}

deletelog/deletelog_test.go

@@ -47,10 +47,12 @@ func TestDeleteLog_checkLog(t *testing.T) {
 				FileGroup: "f2",
 			},
 		}, nil)
-		fx.index.EXPECT().SpaceDelete(ctx, index.Key{
+		key := index.Key{
 			GroupId: "f2",
 			SpaceId: "s2",
-		})
+		}
+		fx.index.EXPECT().SpaceDelete(ctx, key)
+		fx.index.EXPECT().MarkSpaceAsDeleted(ctx, key)
 		require.NoError(t, fx.checkLog(ctx))
 		lastId, err := fx.redis.Get(ctx, lastKey).Result()
 		require.NoError(t, err)

etc/any-sync-filenode.yml

@@ -69,3 +69,4 @@ network:
 networkStorePath: .
 networkUpdateIntervalSec: 600
 defaultLimit: 1073741824
+persistTtl: 300

index/delete.go

@@ -58,3 +58,18 @@ func (ri *redisIndex) spaceDelete(ctx context.Context, key Key, entry groupSpace
 	}
 	return true, nil
 }
+
+func (ri *redisIndex) MarkSpaceAsDeleted(ctx context.Context, key Key) (ok bool, err error) {
+	exists, release, err := ri.AcquireKey(ctx, DelKey(key))
+	if err != nil {
+		return
+	}
+	defer release()
+	if !exists {
+		if err = ri.cl.Set(ctx, DelKey(key), 1, 0).Err(); err != nil {
+			return
+		}
+		return true, nil
+	}
+	return false, nil
+}

index/delete_test.go

@@ -64,3 +64,15 @@ func TestRedisIndex_SpaceDelete(t *testing.T) {
 	require.NoError(t, err)
 	assert.False(t, ok)
 }
+
+func TestRedisIndex_MarkSpaceAsDeleted(t *testing.T) {
+	fx := newFixture(t)
+	defer fx.Finish(t)
+	key := newRandKey()
+	ok, err := fx.MarkSpaceAsDeleted(ctx, key)
+	require.NoError(t, err)
+	assert.True(t, ok)
+
+	err = fx.FileBind(ctx, key, "file", &CidEntries{})
+	assert.ErrorIs(t, err, ErrSpaceIsDeleted)
+}

index/index.go

@@ -29,7 +29,8 @@ const CName = "filenode.index"
 var log = logger.NewNamed(CName)
 
 var (
-	ErrCidsNotExist = errors.New("cids not exist")
+	ErrCidsNotExist   = errors.New("cids not exist")
+	ErrSpaceIsDeleted = errors.New("space is deleted")
 )
 
 type Index interface {
@@ -63,6 +64,7 @@ type Index interface {
 	Check(ctx context.Context, key Key, doFix bool) (checkResults []CheckResult, err error)
 
 	SpaceDelete(ctx context.Context, key Key) (ok bool, err error)
+	MarkSpaceAsDeleted(ctx context.Context, key Key) (ok bool, err error)
 	app.ComponentRunnable
 }
 
@@ -297,4 +299,9 @@ func FileKey(fileId string) string {
 	return "f:" + fileId
 }
 
+func DelKey(k Key) string {
+	hash := strconv.FormatUint(uint64(xxhash.ChecksumString32(k.GroupId)), 36)
+	return "d:" + k.SpaceId + ".{" + hash + "}"
+}
+
 const infoKey = "info"

index/loader.go

@@ -86,6 +86,29 @@ func (ri *redisIndex) AcquireSpace(ctx context.Context, key Key) (entry groupSpa
 		return
 	}
 
+	if !sExists {
+		// check if space marked as deleted
+		var (
+			delKey     = DelKey(key)
+			delRelease func()
+			delExists  bool
+		)
+		if delExists, delRelease, err = ri.AcquireKey(ctx, delKey); err != nil {
+			gRelease()
+			sRelease()
+			return
+		}
+		if delExists {
+			gRelease()
+			sRelease()
+			delRelease()
+			err = ErrSpaceIsDeleted
+			return
+		} else {
+			delRelease()
+		}
+	}
+
 	if entry.space, err = ri.getSpaceEntry(ctx, key); err != nil {
 		gRelease()
 		sRelease()