octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-22 02:48:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(protocol): prioritize closing a connection (#9711)

Browse Source 
The read/write loops may keep going for a while on a closing connection
with lots of read/write activity, as it's random which select case is
chosen. And if the connection is slow or even broken, a single
read/write
can take a long time/until timeout. Add initial non-blocking selects
with only the cases relevant to closing, to prioritize those.
This commit is contained in:
Simon Frei 2024-09-15 21:13:56 +02:00 committed by GitHub
parent 2238a288d9
commit 1f4fde9525
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/protocol/protocol.go
View File

@ -465,6 +465,11 @@ func (c *rawConnection) dispatcherLoop() (err error) {
var msg message
state := stateInitial
for {
select {
case <-c.closed:
return ErrClosed
default:
}
select {
case msg = <-c.inbox:
case <-c.closed:
@ -758,6 +763,17 @@ func (c *rawConnection) writerLoop() {
return
}
for {
// When the connection is closing or closed, that should happen
// immediately, not compete with the (potentially very busy) outbox.
select {
case hm := <-c.closeBox:
_ = c.writeMessage(hm.msg)
close(hm.done)
return
case <-c.closed:
return
default:
}
select {
case cc := <-c.clusterConfigBox:
err := c.writeMessage(cc)