Skip to content

Commit fefc3e6

Browse files
authored
Continue clientLoop even client failed to dial with retry and add more logs (#103)
* Add more logging and enable debug * disable debug log * dial fail log * Continue clientLoop even client failed to dial with retry
1 parent 8081044 commit fefc3e6

2 files changed

Lines changed: 13 additions & 4 deletions

File tree

proxy/adminservice.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ func (s *adminServiceProxyServer) StreamWorkflowReplicationMessages(
280280
for !shutdownChan.IsShutdown() {
281281
req, err := targetStreamServer.Recv()
282282
if err == io.EOF {
283+
logger.Info("targetStreamServer.Recv encountered EOF", tag.Error(err))
283284
return
284285
}
285286

@@ -292,7 +293,11 @@ func (s *adminServiceProxyServer) StreamWorkflowReplicationMessages(
292293
case *adminservice.StreamWorkflowReplicationMessagesRequest_SyncReplicationState:
293294
logger.Debug(fmt.Sprintf("forwarding SyncReplicationState: inclusive %v", attr.SyncReplicationState.InclusiveLowWatermark))
294295
if err = sourceStreamClient.Send(req); err != nil {
295-
logger.Error("sourceStreamClient.Send encountered error", tag.Error(err))
296+
if err != io.EOF {
297+
logger.Error("sourceStreamClient.Send encountered error", tag.Error(err))
298+
} else {
299+
logger.Info("sourceStreamClient.Send encountered EOF", tag.Error(err))
300+
}
296301
return
297302
}
298303
default:
@@ -323,6 +328,7 @@ func (s *adminServiceProxyServer) StreamWorkflowReplicationMessages(
323328
for !shutdownChan.IsShutdown() {
324329
resp, err := sourceStreamClient.Recv()
325330
if err == io.EOF {
331+
logger.Info("sourceStreamClient.Recv encountered EOF", tag.Error(err))
326332
return
327333
}
328334

@@ -336,7 +342,8 @@ func (s *adminServiceProxyServer) StreamWorkflowReplicationMessages(
336342
if err = targetStreamServer.Send(resp); err != nil {
337343
if err != io.EOF {
338344
logger.Error("targetStreamServer.Send encountered error", tag.Error(err))
339-
345+
} else {
346+
logger.Info("targetStreamServer.Send encountered EOF", tag.Error(err))
340347
}
341348
return
342349
}

transport/mux_connection_manager.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ func (m *muxConnectMananger) clientLoop(setting config.TCPClientSetting) error {
186186
m.wg.Add(1)
187187
go func() {
188188
defer m.wg.Done()
189+
connect:
189190
for {
190191
select {
191192
case <-m.shutdownCh:
@@ -201,10 +202,11 @@ func (m *muxConnectMananger) clientLoop(setting config.TCPClientSetting) error {
201202
}
202203

203204
if err := backoff.ThrottleRetry(op, retryPolicy, func(err error) bool {
205+
m.logger.Error("mux client failed to dial", tag.Error(err))
204206
return !m.isShuttingDown()
205207
}); err != nil {
206-
m.logger.Error("mux client failed to dial", tag.Error(err))
207-
return
208+
m.logger.Error("mux client failed to dial with retry", tag.Error(err))
209+
continue connect
208210
}
209211

210212
var conn net.Conn

0 commit comments

Comments
 (0)