status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-09 13:26:07 +00:00
Code Issues Projects Releases Wiki Activity

PR feedback on terminated state checking

Browse Source
This commit is contained in:
Chris S. Kim 2022-09-06 10:28:20 -04:00
parent ddb9375cb6
commit 953808e899
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
agent/grpc-external/services/peerstream/stream_resources.go
View File

@ -162,7 +162,9 @@ func (s *Server) StreamResources(stream pbpeerstream.PeerStreamService_StreamRes
return grpcstatus.Error(codes.InvalidArgument, "initial subscription for unknown PeerID: "+req.PeerID)
}
if !p.IsActive() {
logger.Warn("peering is marked as deleted or terminated", "peer_id", req.PeerID)
// If peering is terminated, then our peer sent the termination message.
// For other non-active states, send the termination message.
if p.State != pbpeering.PeeringState_TERMINATED {
term := &pbpeerstream.ReplicationMessage{
Payload: &pbpeerstream.ReplicationMessage_Terminated_{
Terminated: &pbpeerstream.ReplicationMessage_Terminated{},
@ -172,7 +174,8 @@ func (s *Server) StreamResources(stream pbpeerstream.PeerStreamService_StreamRes
// we don't care if send fails; stream will be killed by termination message or grpc error
_ = stream.Send(term)
return grpcstatus.Error(codes.FailedPrecondition, "peering is marked as deleted: "+req.PeerID)
}
return grpcstatus.Error(codes.Aborted, "peering is marked as deleted: "+req.PeerID)
}
secrets, err := s.GetStore().PeeringSecretsRead(nil, req.PeerID)