anyproto/anytype-heart
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-heart.git synced 2025-06-09 09:35:00 +09:00
Code Activity

GO-1340: Add more logs, remove from uploading queue when adding to removing queue

Browse source
This commit is contained in:
Sergey 2023-04-25 18:17:59 +02:00 • committed by Mikhail Iudin
parent 5211e9329d
commit e6aaf7e126
No known key found for this signature in database
GPG key ID: FAAAA8BAABDFF1C0
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
core/filestorage/filesync/filesyncstore.go
View file

@ -45,22 +45,32 @@ func (s *fileSyncStore) QueueDiscarded(spaceId, fileId string) (err error) {
func (s *fileSyncStore) QueueRemove(spaceId, fileId string) (err error) {
return s.db.Update(func(txn *badger.Txn) error {
if err = removeFromUploadingQueue(txn, spaceId, fileId); err != nil {
return err
}
return txn.Set(removeKey(spaceId, fileId), binTime())
})
}
func (s *fileSyncStore) DoneUpload(spaceId, fileId string) (err error) {
return s.db.Update(func(txn *badger.Txn) error {
if err = txn.Delete(uploadKey(spaceId, fileId)); err != nil {
return err
}
if err = txn.Delete(discardedKey(spaceId, fileId)); err != nil {
if err = removeFromUploadingQueue(txn, spaceId, fileId); err != nil {
return err
}
return txn.Set(doneKey(spaceId, fileId), binTime())
})
}
func removeFromUploadingQueue(txn *badger.Txn, spaceID string, fileID string) error {
if err := txn.Delete(uploadKey(spaceID, fileID)); err != nil {
return fmt.Errorf("remove from uploading queue: %w", err)
}
if err := txn.Delete(discardedKey(spaceID, fileID)); err != nil {
return fmt.Errorf("remove from discarded uploading queue: %w", err)
}
return nil
}
func (s *fileSyncStore) DoneDiscarded(spaceId, fileId string) (err error) {
return s.db.Update(func(txn *badger.Txn) error {
if err = txn.Delete(discardedKey(spaceId, fileId)); err != nil {

2
core/filestorage/filesync/remove.go
View file

@ -9,6 +9,7 @@ import (
)
func (f *fileSync) RemoveFile(spaceId, fileId string) (err error) {
log.Info("add file to removing queue", zap.String("fileID", fileId))
defer func() {
if err == nil {
select {
@ -67,5 +68,6 @@ func (f *fileSync) tryToRemove() (string, error) {
}
func (f *fileSync) removeFile(ctx context.Context, spaceId, fileId string) (err error) {
log.Info("removing file", zap.String("fileID", fileId))
return f.rpcStore.DeleteFiles(ctx, spaceId, fileId)
}

2
core/filestorage/filesync/upload.go
View file

@ -18,7 +18,7 @@ import (
)
func (f *fileSync) AddFile(spaceId, fileId string) (err error) {
log.Info("add file to queue", zap.String("fileID", fileId))
log.Info("add file to uploading queue", zap.String("fileID", fileId))
defer func() {
if err == nil {
select {