agent: better handling errors during connection handshake retries #1578
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
epoberezkin
force-pushed
the
ep/agent-connect-errors
branch
from
9039b6a to
833be46
Compare
epoberezkin
changed the title
epoberezkin
force-pushed
the
ep/agent-connect-errors
branch
from
56ed24f to
6eb362e
Compare
epoberezkin
commented
Jun 25, 2025
| (Right agentMsgBody, CR.SMDNoChange) -> | ||
| case skipped of | ||
| CR.SMDNoChange -> pure () | ||
| _ -> logWarn "conf: skipped confirmations" |
Member
Author
There was a problem hiding this comment.
This allows retries confirmations that result in skipped messages
epoberezkin
commented
Jun 25, 2025
| let pqInitKeys = CR.joinContactInitialKeys (v >= pqdrSMPAgentVersion) pqSup | ||
| (CCLink cReq _, service) <- case conn of | ||
| NewConnection _ -> newRcvConnSrv c userId connId enableNtfs SCMInvitation Nothing Nothing pqInitKeys subMode srv | ||
| RcvConnection _ rq -> mkJoinInvitation rq pqInitKeys |
Member
Author
There was a problem hiding this comment.
This allows repeat joins to contact address when the queue is created but the error happens when sending invitation
epoberezkin
commented
Jun 25, 2025
| NewConnection _ -> doJoin Nothing Nothing | ||
| SndConnection _ sq -> doJoin Nothing (Just sq) | ||
| DuplexConnection _ (rq@RcvQueue {status = New} :| _) (sq@SndQueue {status = sqStatus} :| _) | ||
| | sqStatus == New || sqStatus == Secured -> doJoin (Just rq) (Just sq) |
Member
Author
There was a problem hiding this comment.
This allows retries after initiator's queue is secured
epoberezkin
commented
Jun 25, 2025
| mkAgentConfirmation c cData rq_ sq srv connInfo subMode = do | ||
| (qInfo, service) <- case rq_ of | ||
| Nothing -> createReplyQueue c cData sq subMode srv | ||
| Just rq@RcvQueue {smpClientVersion = v, clientService} -> pure (SMPQueueInfo v $ rcvSMPQueueAddress rq, dbServiceId <$> clientService) |
Member
Author
There was a problem hiding this comment.
This allows retries after queue is created, but the confirmation failed to sent.
epoberezkin
commented
Jun 25, 2025
| logInfo . decodeUtf8 $ "Agent connected to " <> showServer srv <> " (user " <> bshow userId <> maybe "" (" for entity " <>) entityId_ <> ")" | ||
| atomically $ putTMVar (sessionVar v) (Right client) | ||
| atomically $ writeTBQueue (subQ c) ("", "", AEvt SAENone $ hostEvent CONNECT client) | ||
| liftIO $ nonBlockingWriteTBQueue (subQ c) ("", "", AEvt SAENone $ hostEvent CONNECT client) |
Member
Author
There was a problem hiding this comment.
This may be hanging in the test because the queue is small, but in theory can reach capacity in the app too if there are too many events.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.