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-5612 Refactor loading, make sure that setLoadErr is set when not retrying

Browse source
This commit is contained in:
Mikhail Rakhmanov 2025-05-19 18:22:49 +02:00
parent dd16e156fa
commit 0ed333dfba
No known key found for this signature in database
GPG key ID: DED12CFEF5B8396B
1 changed files with 25 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

69
space/internal/components/spaceloader/loadingspace.go
View file

@ -8,7 +8,6 @@ import (
"github.com/anyproto/any-sync/app/logger"
"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
"github.com/anyproto/any-sync/commonspace/spacesyncproto"
"go.uber.org/zap"
"github.com/anyproto/anytype-heart/space/clientspace"
@ -73,11 +72,13 @@ func (ls *loadingSpace) setLoadErr(err error) {
func (ls *loadingSpace) loadRetry(ctx context.Context) {
defer func() {
if err := ls.spaceServiceProvider.onLoad(ls.space, ls.getLoadErr()); err != nil {
log.WarnCtx(ctx, "space onLoad error", zap.Error(err))
log.WarnCtx(ctx, "space onLoad error", zap.Error(err), zap.Error(ls.getLoadErr()))
}
close(ls.loadCh)
}()
if ls.load(ctx) {
shouldRetry, err := ls.load(ctx)
if !shouldRetry {
ls.setLoadErr(err)
return
}
timeout := 1 * time.Second
@ -87,7 +88,9 @@ func (ls *loadingSpace) loadRetry(ctx context.Context) {
ls.setLoadErr(ctx.Err())
return
case <-time.After(timeout):
if ls.load(ctx) {
shouldRetry, err := ls.load(ctx)
if !shouldRetry {
ls.setLoadErr(err)
return
}
}
@ -98,47 +101,25 @@ func (ls *loadingSpace) loadRetry(ctx context.Context) {
}
}
func (ls *loadingSpace) load(ctx context.Context) (notRetryable bool) {
func (ls *loadingSpace) load(ctx context.Context) (ok bool, err error) {
sp, err := ls.spaceServiceProvider.open(ctx)
if errors.Is(err, spacesyncproto.ErrSpaceMissing) {
log.WarnCtx(ctx, "space load: space is missing", zap.String("spaceId", ls.ID), zap.Bool("notRetryable", ls.disableRemoteLoad), zap.Error(err))
return ls.disableRemoteLoad
}
if err == nil {
err = sp.WaitMandatoryObjects(ctx)
if err != nil {
notRetryable = errors.Is(err, objecttree.ErrHasInvalidChanges)
log.WarnCtx(ctx, "space load: mandatory objects error", zap.String("spaceId", ls.ID), zap.Error(err), zap.Bool("notRetryable", ls.disableRemoteLoad || notRetryable))
return ls.disableRemoteLoad || notRetryable
}
}
if err != nil {
if sp != nil {
closeErr := sp.Close(ctx)
if closeErr != nil {
log.WarnCtx(ctx, "space close error", zap.Error(closeErr))
}
}
ls.setLoadErr(err)
if errors.Is(err, context.Canceled) {
log.WarnCtx(ctx, "space load: error: context bug", zap.String("spaceId", ls.ID), zap.Error(err), zap.Bool("notRetryable", ls.disableRemoteLoad))
// hotfix for drpc bug
// todo: remove after https://github.com/anyproto/any-sync/pull/448 got integrated
return ls.disableRemoteLoad
}
log.WarnCtx(ctx, "space load: error", zap.String("spaceId", ls.ID), zap.Error(err), zap.Bool("notRetryable", true))
} else {
if ls.latestAclHeadId != "" && !ls.disableRemoteLoad {
acl := sp.CommonSpace().Acl()
acl.RLock()
defer acl.RUnlock()
_, err := acl.Get(ls.latestAclHeadId)
if err != nil {
log.WarnCtx(ctx, "space load: acl head not found", zap.String("spaceId", ls.ID), zap.String("aclHeadId", ls.latestAclHeadId), zap.Error(err), zap.Bool("notRetryable", false))
return false
}
}
ls.space = sp
return ls.disableRemoteLoad, err
}
return true
err = sp.WaitMandatoryObjects(ctx)
if err != nil {
notRetryable := errors.Is(err, objecttree.ErrHasInvalidChanges) || ls.disableRemoteLoad
return notRetryable, err
}
if ls.latestAclHeadId != "" && !ls.disableRemoteLoad {
acl := sp.CommonSpace().Acl()
acl.RLock()
defer acl.RUnlock()
_, err := acl.Get(ls.latestAclHeadId)
if err != nil {
return false, err
}
}
ls.space = sp
return true, nil
}