Fix rollbacks after commit

commonspace/headsync/statestorage/statestorage.go

@@ -108,12 +108,8 @@ func Create(ctx context.Context, state State, store anystore.DB) (st StateStorag
 		return nil, err
 	}
 	storage, err := CreateTx(tx.Context(), state, store)
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		}
-	}()
 	if err != nil {
+		tx.Rollback()
 		return nil, err
 	}
 	return storage, tx.Commit()

commonspace/object/acl/list/storage.go

@@ -66,12 +66,8 @@ func CreateStorage(ctx context.Context, root *consensusproto.RawRecordWithId, he
 		return nil, err
 	}
 	storage, err := CreateStorageTx(tx.Context(), root, headStorage, store)
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		}
-	}()
 	if err != nil {
+		tx.Rollback()
 		return nil, err
 	}
 	return storage, tx.Commit()
@@ -210,6 +206,13 @@ func (s *storage) AddAll(ctx context.Context, records []StorageRecord) error {
 	if err != nil {
 		return fmt.Errorf("failed to create write tx: %w", err)
 	}
+	defer func() {
+		if err != nil {
+			_ = tx.Rollback()
+		} else {
+			err = tx.Commit()
+		}
+	}()
 	vals := make([]*anyenc.Value, 0, len(records))
 	for _, ch := range records {
 		newVal := newStorageRecordValue(ch, arena)
@@ -217,20 +220,14 @@ func (s *storage) AddAll(ctx context.Context, records []StorageRecord) error {
 	}
 	err = s.recordsColl.Insert(tx.Context(), vals...)
 	if err != nil {
-		tx.Rollback()
+		return err
-		return nil
 	}
 	head := records[len(records)-1].Id
 	update := headstorage.HeadsUpdate{
 		Id:    s.id,
 		Heads: []string{head},
 	}
-	err = s.headStorage.UpdateEntryTx(tx.Context(), update)
+	return s.headStorage.UpdateEntryTx(tx.Context(), update)
-	if err != nil {
-		tx.Rollback()
-		return err
-	}
-	return tx.Commit()
 }
 
 func (s *storage) Id() string {

commonspace/object/tree/objecttree/storage.go

@@ -82,12 +82,8 @@ func CreateStorage(ctx context.Context, root *treechangeproto.RawTreeChangeWithI
 		return nil, err
 	}
 	storage, err := CreateStorageTx(tx.Context(), root, headStorage, store)
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		}
-	}()
 	if err != nil {
+		tx.Rollback()
 		return nil, err
 	}
 	return storage, tx.Commit()
@@ -225,13 +221,19 @@ func (s *storage) AddAll(ctx context.Context, changes []StorageChange, heads []s
 	if err != nil {
 		return fmt.Errorf("failed to create write tx: %w", err)
 	}
+	defer func() {
+		if err != nil {
+			tx.Rollback()
+		} else {
+			err = tx.Commit()
+		}
+	}()
 	for _, ch := range changes {
 		ch.TreeId = s.id
 		newVal := newStorageChangeValue(ch, arena)
 		err = s.changesColl.Insert(tx.Context(), newVal)
 		arena.Reset()
 		if err != nil {
-			tx.Rollback()
 			return err
 		}
 	}
@@ -240,12 +242,7 @@ func (s *storage) AddAll(ctx context.Context, changes []StorageChange, heads []s
 		Heads:          heads,
 		CommonSnapshot: &commonSnapshot,
 	}
-	err = s.headStorage.UpdateEntryTx(tx.Context(), update)
+	return s.headStorage.UpdateEntryTx(tx.Context(), update)
-	if err != nil {
-		tx.Rollback()
-		return err
-	}
-	return tx.Commit()
 }
 
 func (s *storage) AddAllNoError(ctx context.Context, changes []StorageChange, heads []string, commonSnapshot string) error {
@@ -255,13 +252,19 @@ func (s *storage) AddAllNoError(ctx context.Context, changes []StorageChange, he
 	if err != nil {
 		return fmt.Errorf("failed to create write tx: %w", err)
 	}
+	defer func() {
+		if err != nil {
+			tx.Rollback()
+		} else {
+			err = tx.Commit()
+		}
+	}()
 	for _, ch := range changes {
 		ch.TreeId = s.id
 		newVal := newStorageChangeValue(ch, arena)
 		err = s.changesColl.Insert(tx.Context(), newVal)
 		arena.Reset()
 		if err != nil && !errors.Is(err, anystore.ErrDocExists) {
-			tx.Rollback()
 			return err
 		}
 	}
@@ -270,12 +273,7 @@ func (s *storage) AddAllNoError(ctx context.Context, changes []StorageChange, he
 		Heads:          heads,
 		CommonSnapshot: &commonSnapshot,
 	}
-	err = s.headStorage.UpdateEntryTx(tx.Context(), update)
+	return s.headStorage.UpdateEntryTx(tx.Context(), update)
-	if err != nil {
-		tx.Rollback()
-		return err
-	}
-	return tx.Commit()
 }
 
 func (s *storage) Delete(ctx context.Context) error {

commonspace/spacestorage/spacestorage.go

@@ -66,7 +66,9 @@ func Create(ctx context.Context, store anystore.DB, payload SpaceStorageCreatePa
 	}
 	defer func() {
 		if err != nil {
-			tx.Rollback()
+			_ = tx.Rollback()
+		} else {
+			err = tx.Commit()
 		}
 	}()
 	changesColl, err := store.Collection(tx.Context(), objecttree.CollName)
@@ -110,7 +112,7 @@ func Create(ctx context.Context, store anystore.DB, payload SpaceStorageCreatePa
 		headStorage:  headStorage,
 		stateStorage: stateStorage,
 		aclStorage:   aclStorage,
-	}, tx.Commit()
+	}, nil
 }
 
 func New(ctx context.Context, spaceId string, store anystore.DB) (SpaceStorage, error) {