From 10c8492276cf8ac56a0cd7b77d296734d30950b5 Mon Sep 17 00:00:00 2001 From: Airat Arifullin Date: Fri, 26 Jul 2024 11:11:12 +0300 Subject: [PATCH] [#XX] rpcclient: Fix ws-reader hang on sending a response * `wsReader` may get blocked on sending to the response channel if receiver can't read the response out. * If `wsWriter` goroutine got an error or `wsClient` is going to get shut down, then `wsReader` should stop trying to send the response as it's not reasonable and this leads only to blocking. Signed-off-by: Airat Arifullin --- pkg/rpcclient/wsclient.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkg/rpcclient/wsclient.go b/pkg/rpcclient/wsclient.go index dc877c407..38a1d4527 100644 --- a/pkg/rpcclient/wsclient.go +++ b/pkg/rpcclient/wsclient.go @@ -601,7 +601,15 @@ readloop: connCloseErr = fmt.Errorf("unknown response channel for response %d", id) break readloop // Unknown response (unexpected response ID). } - ch <- &rr.Response + select { + case <-c.writerDone: + connCloseErr = fmt.Errorf("response won't be sent to channel %d: ws-writer is done", id) + break readloop + case <-c.shutdown: + connCloseErr = fmt.Errorf("response won't be sent to channel %d: shutting down", id) + break readloop + case ch <- &rr.Response: + } } else { // Malformed response, neither valid request, nor valid response. connCloseErr = fmt.Errorf("malformed response")