Merge pull request #199 from anyproto/GO-6351-fix-acl-delete

GO-6351 remove acl deletion logic

Author: cheggaaa

nodespace/spacedeleter/spacedeleter.go

@@ -9,8 +9,6 @@ import (
 	"github.com/anyproto/any-sync/app"
 	"github.com/anyproto/any-sync/app/logger"
 	"github.com/anyproto/any-sync/commonspace/spacestorage"
-	"github.com/anyproto/any-sync/consensus/consensusclient"
-	"github.com/anyproto/any-sync/consensus/consensusproto/consensuserr"
 	"github.com/anyproto/any-sync/coordinator/coordinatorclient"
 	"github.com/anyproto/any-sync/coordinator/coordinatorproto"
 	"github.com/anyproto/any-sync/util/periodicsync"
@@ -38,7 +36,6 @@ func New() app.Component {
 type spaceDeleter struct {
 	periodicCall    periodicsync.PeriodicSync
 	coordClient     coordinatorclient.CoordinatorClient
-	consClient      consensusclient.Service
 	deletionStorage nodestorage.IndexStorage
 	spaceService    nodespace.Service
 	storageProvider nodestorage.NodeStorage
@@ -52,7 +49,6 @@ func (s *spaceDeleter) Init(a *app.App) (err error) {
 	s.periodicCall = periodicsync.NewPeriodicSync(periodicDeleteSecs, deleteTimeout, s.delete, log)
 	s.coordClient = a.MustComponent(coordinatorclient.CName).(coordinatorclient.CoordinatorClient)
 	s.spaceService = a.MustComponent(nodespace.CName).(nodespace.Service)
-	s.consClient = a.MustComponent(consensusclient.CName).(consensusclient.Service)
 	s.storageProvider = a.MustComponent(nodestorage.CName).(nodestorage.NodeStorage)
 	s.syncWaiter = a.MustComponent(nodesync.CName).(nodesync.NodeSync).WaitSyncOnStart()
 	return
@@ -113,23 +109,6 @@ 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))
 	deleteSpace := func() error {
-		// trying to get the storage
-		st, err := s.storageProvider.WaitSpaceStorage(ctx, rec.SpaceId)
-		if err == nil {
-			// getting the log Id
-			acl, err := st.AclStorage()
-			if err != nil {
-				st.Close(ctx)
-				return err
-			}
-			logId := acl.Id()
-			st.Close(ctx)
-			// deleting log from consensus
-			err = s.consClient.DeleteLog(ctx, logId)
-			if err != nil && !errors.Is(err, consensuserr.ErrLogNotFound) {
-				return err
-			}
-		}
 		// deleting space storage
 		err = s.storageProvider.DeleteSpaceStorage(ctx, rec.SpaceId)
 		if err != nil && !errors.Is(err, spacestorage.ErrSpaceStorageMissing) {

nodespace/spacedeleter/spacedeleter_test.go

@@ -6,9 +6,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/anyproto/any-sync/consensus/consensusclient"
-	"github.com/anyproto/any-sync/consensus/consensusclient/mock_consensusclient"
-	"github.com/anyproto/any-sync/consensus/consensusproto/consensuserr"
 	"github.com/anyproto/any-sync/coordinator/coordinatorproto"
 	"github.com/anyproto/any-sync/testutil/anymock"
 	"github.com/stretchr/testify/assert"
@@ -40,7 +37,6 @@ func TestSpaceDeleter_Run_Ok(t *testing.T) {
 	lg := mockDeletionLog(store.Id())
 
 	fx.coordClient.EXPECT().DeletionLog(gomock.Any(), "", logLimit).Return(lg, nil).AnyTimes()
-	fx.consClient.EXPECT().DeleteLog(gomock.Any(), payload.AclWithId.Id).Return(nil)
 	store.Close(context.Background())
 
 	close(fx.waiterChan)
@@ -71,7 +67,6 @@ func TestSpaceDeleter_Run_Ok_NewPush(t *testing.T) {
 	lg := mockDeletionLogNewPush(store.Id())
 
 	fx.coordClient.EXPECT().DeletionLog(gomock.Any(), "", logLimit).Return(lg, nil).AnyTimes()
-	fx.consClient.EXPECT().DeleteLog(gomock.Any(), payload.AclWithId.Id).Return(nil)
 	store.Close(context.Background())
 
 	close(fx.waiterChan)
@@ -85,31 +80,6 @@ func TestSpaceDeleter_Run_Ok_NewPush(t *testing.T) {
 	require.Equal(t, nodestorage.SpaceStatusOk, status)
 }
 
-func TestSpaceDeleter_Run_Ok_LogNotFound(t *testing.T) {
-	fx := newSpaceDeleterFixture(t)
-	defer fx.stop(t)
-	payload := nodestorage.NewStorageCreatePayload(t)
-	store, err := fx.storage.CreateSpaceStorage(ctx, payload)
-	require.NoError(t, err)
-	lg := mockDeletionLog(store.Id())
-
-	fx.coordClient.EXPECT().DeletionLog(gomock.Any(), "", logLimit).Return(lg, nil).AnyTimes()
-	fx.consClient.EXPECT().DeleteLog(gomock.Any(), payload.AclWithId.Id).Return(consensuserr.ErrLogNotFound)
-	store.Close(context.Background())
-
-	close(fx.waiterChan)
-	<-fx.deleter.testChan
-
-	id, err := fx.storage.IndexStorage().LastRecordId(ctx)
-	require.NoError(t, err)
-	require.Equal(t, lg[2].Id, id)
-	store, err = fx.storage.WaitSpaceStorage(context.Background(), payload.SpaceHeaderWithId.Id)
-	require.Error(t, err)
-	status, err := fx.storage.IndexStorage().SpaceStatus(ctx, payload.SpaceHeaderWithId.Id)
-	require.NoError(t, err)
-	require.Equal(t, nodestorage.SpaceStatusRemove, status)
-}
-
 func TestSpaceDeleter_Run_Ok_NoStorage(t *testing.T) {
 	fx := newSpaceDeleterFixture(t)
 	defer fx.stop(t)
@@ -170,32 +140,6 @@ func TestSpaceDeleter_Run_Ok_EmptyStorage(t *testing.T) {
 	require.Equal(t, nodestorage.SpaceStatusRemove, status)
 }
 
-func TestSpaceDeleter_Run_Failure_LogError(t *testing.T) {
-	fx := newSpaceDeleterFixture(t)
-	payload := nodestorage.NewStorageCreatePayload(t)
-	store, err := fx.storage.CreateSpaceStorage(ctx, payload)
-	require.NoError(t, err)
-	lg := mockDeletionLog(store.Id())
-
-	fx.coordClient.EXPECT().DeletionLog(gomock.Any(), "", logLimit).Return(lg, nil).AnyTimes()
-	fx.consClient.EXPECT().DeleteLog(gomock.Any(), payload.AclWithId.Id).Return(consensuserr.ErrConflict)
-	store.Close(context.Background())
-
-	close(fx.waiterChan)
-	<-fx.deleter.testChan
-
-	id, err := fx.storage.IndexStorage().LastRecordId(ctx)
-	require.NoError(t, err)
-	require.Equal(t, lg[1].Id, id)
-	// checking that storage is still there
-	store, err = fx.storage.WaitSpaceStorage(ctx, payload.SpaceHeaderWithId.Id)
-	require.NoError(t, err)
-	store.Close(context.Background())
-	_, err = fx.storage.IndexStorage().SpaceStatus(ctx, payload.SpaceHeaderWithId.Id)
-	require.Error(t, nodestorage.ErrUnknownSpaceId, err)
-	fx.stop(t)
-}
-
 func mockDeletionLog(realId string) []*coordinatorproto.DeletionLogRecord {
 	return []*coordinatorproto.DeletionLogRecord{
 		{Id: "1", SpaceId: "space1", Status: coordinatorproto.DeletionLogRecordStatus_Ok},
@@ -215,7 +159,6 @@ func mockDeletionLogNewPush(realId string) []*coordinatorproto.DeletionLogRecord
 
 type spaceDeleterFixture struct {
 	coordClient  *mock_coordinatorclient.MockCoordinatorClient
-	consClient   *mock_consensusclient.MockService
 	spaceService *mock_nodespace.MockService
 	storage      nodestorage.NodeStorage
 	nodesync     *mock_nodesync.MockNodeSync
@@ -244,19 +187,16 @@ func newSpaceDeleterFixture(t *testing.T) *spaceDeleterFixture {
 	coordClient := mock_coordinatorclient.NewMockCoordinatorClient(ctrl)
 	spaceService := mock_nodespace.NewMockService(ctrl)
 	nodeSync := mock_nodesync.NewMockNodeSync(ctrl)
-	consClient := mock_consensusclient.NewMockService(ctrl)
 	archive := mock_archive.NewMockArchive(ctrl)
 	storage := nodestorage.New()
 	anymock.ExpectComp(coordClient.EXPECT(), coordinatorclient.CName)
 	anymock.ExpectComp(spaceService.EXPECT(), nodespace.CName)
-	anymock.ExpectComp(consClient.EXPECT(), consensusclient.CName)
 	anymock.ExpectComp(nodeSync.EXPECT(), nodesync.CName)
 	anymock.ExpectComp(archive.EXPECT(), "node.archive")
 	nodeSync.EXPECT().WaitSyncOnStart().Return(waiterChan).AnyTimes()
 	deleter := New().(*spaceDeleter)
 	a.Register(storeConfig(dir)).
 		Register(coordClient).
-		Register(consClient).
 		Register(storage).
 		Register(spaceService).
 		Register(archive).
@@ -266,7 +206,6 @@ func newSpaceDeleterFixture(t *testing.T) *spaceDeleterFixture {
 	require.NoError(t, err)
 	return &spaceDeleterFixture{
 		coordClient:  coordClient,
-		consClient:   consClient,
 		spaceService: spaceService,
 		storage:      storage,
 		nodesync:     nodeSync,
@@ -282,7 +221,6 @@ const testSaveDelay = 500 * time.Millisecond
 func (fx *spaceDeleterFixture) stop(t *testing.T) {
 	fx.nodesync.EXPECT().Close(gomock.Any()).Return(nil).AnyTimes()
 	fx.spaceService.EXPECT().Close(gomock.Any()).Return(nil).AnyTimes()
-	fx.consClient.EXPECT().Close(gomock.Any()).Return(nil).AnyTimes()
 	err := fx.app.Close(context.Background())
 	require.NoError(t, err)
 	fx.ctrl.Finish()