fix: 修复 switchServerAsync 在重连进行中导致的阻塞问题

xiaomudk · xiaomudk · commit 1d48e45cdcee · 2026-01-06T10:31:20.000+08:00
diff --git a/common/remote/rpc/rpc_client.go b/common/remote/rpc/rpc_client.go
@@ -407,7 +407,13 @@ func (r *RpcClient) RegisterConnectionListener(listener IConnectionEventListener
 }
 
 func (r *RpcClient) switchServerAsync(recommendServerInfo ServerInfo, onRequestFail bool) {
-	r.reconnectionChan <- ReconnectContext{serverInfo: recommendServerInfo, onRequestFail: onRequestFail}
+	select {
+	case r.reconnectionChan <- ReconnectContext{serverInfo: recommendServerInfo, onRequestFail: onRequestFail}:
+		// Reconnection request sent successfully
+	default:
+		// Channel is full, skip this request as reconnection is already in progress
+		logger.Warnf("reconnection already in progress, skip this request")
+	}
 }
 
 func (r *RpcClient) reconnect(serverInfo ServerInfo, onRequestFail bool) {

Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,13 @@ func (r *RpcClient) RegisterConnectionListener(listener IConnectionEventListener`
`407`	`407`	`}`
`408`	`408`
`409`	`409`	`func (r *RpcClient) switchServerAsync(recommendServerInfo ServerInfo, onRequestFail bool) {`
`410`		`- r.reconnectionChan <- ReconnectContext{serverInfo: recommendServerInfo, onRequestFail: onRequestFail}`
	`410`	`+ select {`
	`411`	`+ case r.reconnectionChan <- ReconnectContext{serverInfo: recommendServerInfo, onRequestFail: onRequestFail}:`
	`412`	`+ // Reconnection request sent successfully`
	`413`	`+ default:`
	`414`	`+ // Channel is full, skip this request as reconnection is already in progress`
	`415`	`+ logger.Warnf("reconnection already in progress, skip this request")`
	`416`	`+ }`
`411`	`417`	`}`
`412`	`418`
`413`	`419`	`func (r *RpcClient) reconnect(serverInfo ServerInfo, onRequestFail bool) {`