Skip to content

[management] do not add ephemeral peer to deletion queue on logout #4274

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[management] do not add ephemeral peer to deletion queue on logout #4274

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions management/server/grpcserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,6 +937,12 @@ func (s *GRPCServer) Logout(ctx context.Context, req *proto.EncryptedMessage) (*
userID = activity.SystemInitiator
}

// if peer is ephemeral, we need to set it to false to prevent adding it to ephemeral deletion queue
if peer.Ephemeral {
peer.Ephemeral = false
}
s.cancelPeerRoutines(ctx, peer.AccountID, peer)
Comment on lines +940 to +944
Copy link
Preview

Copilot AI Aug 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The call to cancelPeerRoutines appears to be moved from its original location. Verify that this placement is correct and that the peer state modifications (setting Ephemeral to false) don't interfere with the routine cancellation logic.

Suggested change
// if peer is ephemeral, we need to set it to false to prevent adding it to ephemeral deletion queue
if peer.Ephemeral {
peer.Ephemeral = false
}
s.cancelPeerRoutines(ctx, peer.AccountID, peer)
// cancel peer routines before modifying peer state
s.cancelPeerRoutines(ctx, peer.AccountID, peer)
// if peer is ephemeral, we need to set it to false to prevent adding it to ephemeral deletion queue
if peer.Ephemeral {
peer.Ephemeral = false
}

Copilot uses AI. Check for mistakes.


if err = s.accountManager.DeletePeer(ctx, peer.AccountID, peer.ID, userID); err != nil {
log.WithContext(ctx).Errorf("failed to logout peer %s: %v", peerKey.String(), err)
return nil, mapError(ctx, err)
Expand Down
Loading