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

GO-2947: Fix deadlock

Browse source
This commit is contained in:
Sergey 2024-02-21 11:05:17 +01:00
parent f10b0c6b86
commit f5b548c1f1
No known key found for this signature in database
GPG key ID: 3B6BEF79160221C6
1 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
core/files/fileobject/fileindex.go
View file

@ -200,7 +200,8 @@ func (ind *indexer) injectMetadataToState(ctx context.Context, st *state.State,
details, typeKey, err := ind.buildDetails(ctx, fileId)
if errors.Is(err, domain.ErrFileNotFound) {
log.Errorf("build details: %v", err)
return ind.markFileAsNotFound(id)
ind.markFileAsNotFound(st)
return nil
}
if err != nil {
return fmt.Errorf("build details: %w", err)
@ -225,16 +226,8 @@ func (ind *indexer) injectMetadataToState(ctx context.Context, st *state.State,
return nil
}
func (ind *indexer) markFileAsNotFound(id domain.FullID) error {
space, err := ind.spaceService.Get(ind.indexCtx, id.SpaceID)
if err != nil {
return fmt.Errorf("get space: %w", err)
}
return space.Do(id.ObjectID, func(sb smartblock.SmartBlock) error {
st := sb.NewState()
st.SetDetailAndBundledRelation(bundle.RelationKeyFileIndexingStatus, pbtypes.Int64(int64(model.FileIndexingStatus_NotFound)))
return sb.Apply(st)
})
func (ind *indexer) markFileAsNotFound(st *state.State) {
st.SetDetailAndBundledRelation(bundle.RelationKeyFileIndexingStatus, pbtypes.Int64(int64(model.FileIndexingStatus_NotFound)))
}
func (ind *indexer) buildDetails(ctx context.Context, id domain.FullFileId) (details *types.Struct, typeKey domain.TypeKey, err error) {