Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix version vector cleanup during client deactivation #1068

Merged
merged 6 commits into from
Nov 19, 2024
Merged

Fix version vector cleanup during client deactivation #1068

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ca345d
Fix manual update of clientInfo to allow version vector removal when …
raararaara Nov 14, 2024
719022d
Move `UpdateVersionVector` handling to cluster server detach
raararaara Nov 19, 2024
e18af1e
Erase duplicate vv update
raararaara Nov 19, 2024
fce25c1
Swap order of arguments in assert.Equal for gc tests
raararaara Nov 19, 2024
3cf29bf
Add missing test
raararaara Nov 19, 2024
c7770f2
Erase duplicate test
raararaara Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions server/clients/clients.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,6 @@ func Deactivate(
if err := cli.DetachDocument(ctx, project, actorID, docID, project.PublicKey, docInfo.Key); err != nil {
return nil, err
}

if err := be.DB.UpdateVersionVector(
ctx,
info,
types.DocRefKey{
ProjectID: refKey.ProjectID,
DocID: docID,
},
nil,
); err != nil {
return nil, err
}
}

return be.DB.DeactivateClient(ctx, refKey)
Expand Down
12 changes: 12 additions & 0 deletions server/rpc/cluster_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,5 +132,17 @@ func (s *clusterServer) DetachDocument(
return nil, err
}

if err = s.backend.DB.UpdateVersionVector(
ctx,
clientInfo,
types.DocRefKey{
ProjectID: project.ID,
DocID: summary.ID,
},
nil,
); err != nil {
return nil, err
}

return connect.NewResponse(&api.ClusterServiceDetachDocumentResponse{}), nil
}
8 changes: 3 additions & 5 deletions test/integration/gc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1190,10 +1190,8 @@ func TestGarbageCollection(t *testing.T) {
assert.Equal(t, d2.GarbageLen(), 2)
assert.Equal(t, len(d2.VersionVector()), 2)

// TODO(JOOHOJANG): remove below comments after https://github.com/yorkie-team/yorkie/issues/1058 resolved
// Due to https://github.com/yorkie-team/yorkie/issues/1058, removing deactivated client's version vector is not working properly now.
// assert.NoError(t, c2.Sync(ctx))
// assert.Equal(t, d2.GarbageLen(), 0)
// assert.Equal(t, len(d2.VersionVector()), 1)
assert.NoError(t, c2.Sync(ctx))
assert.Equal(t, d2.GarbageLen(), 0)
assert.Equal(t, len(d2.VersionVector()), 1)
})
}
Loading