Skip to content

Commit 696ff46

Browse files
authored
be explicit about protocol in state errors: TCP or UDP (#258)
1 parent 3902b1c commit 696ff46

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

state.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ func (m *Memberlist) probeNode(node *nodeState) {
329329
}()
330330
if node.State == StateAlive {
331331
if err := m.encodeAndSendMsg(node.FullAddress(), pingMsg, &ping); err != nil {
332-
m.logger.Printf("[ERR] memberlist: Failed to send ping: %s", err)
332+
m.logger.Printf("[ERR] memberlist: Failed to send UDP ping: %s", err)
333333
if failedRemote(err) {
334334
goto HANDLE_REMOTE_FAILURE
335335
} else {
@@ -339,7 +339,7 @@ func (m *Memberlist) probeNode(node *nodeState) {
339339
} else {
340340
var msgs [][]byte
341341
if buf, err := encode(pingMsg, &ping); err != nil {
342-
m.logger.Printf("[ERR] memberlist: Failed to encode ping message: %s", err)
342+
m.logger.Printf("[ERR] memberlist: Failed to encode UDP ping message: %s", err)
343343
return
344344
} else {
345345
msgs = append(msgs, buf.Bytes())
@@ -354,7 +354,7 @@ func (m *Memberlist) probeNode(node *nodeState) {
354354

355355
compound := makeCompoundMessage(msgs)
356356
if err := m.rawSendMsgPacket(node.FullAddress(), &node.Node, compound.Bytes()); err != nil {
357-
m.logger.Printf("[ERR] memberlist: Failed to send compound ping and suspect message to %s: %s", addr, err)
357+
m.logger.Printf("[ERR] memberlist: Failed to send UDP compound ping and suspect message to %s: %s", addr, err)
358358
if failedRemote(err) {
359359
goto HANDLE_REMOTE_FAILURE
360360
} else {
@@ -393,7 +393,7 @@ func (m *Memberlist) probeNode(node *nodeState) {
393393
// probe interval it will give the TCP fallback more time, which
394394
// is more active in dealing with lost packets, and it gives more
395395
// time to wait for indirect acks/nacks.
396-
m.logger.Printf("[DEBUG] memberlist: Failed ping: %s (timeout reached)", node.Name)
396+
m.logger.Printf("[DEBUG] memberlist: Failed UDP ping: %s (timeout reached)", node.Name)
397397
}
398398

399399
HANDLE_REMOTE_FAILURE:
@@ -426,7 +426,7 @@ HANDLE_REMOTE_FAILURE:
426426
}
427427

428428
if err := m.encodeAndSendMsg(peer.FullAddress(), indirectPingMsg, &ind); err != nil {
429-
m.logger.Printf("[ERR] memberlist: Failed to send indirect ping: %s", err)
429+
m.logger.Printf("[ERR] memberlist: Failed to send indirect UDP ping: %s", err)
430430
}
431431
}
432432

@@ -453,7 +453,7 @@ HANDLE_REMOTE_FAILURE:
453453
if ne, ok := err.(net.Error); ok && ne.Timeout() {
454454
to = fmt.Sprintf("timeout %s: ", probeInterval)
455455
}
456-
m.logger.Printf("[ERR] memberlist: Failed fallback ping: %s%s", to, err)
456+
m.logger.Printf("[ERR] memberlist: Failed fallback TCP ping: %s%s", to, err)
457457
} else {
458458
fallbackCh <- didContact
459459
}
@@ -478,7 +478,7 @@ HANDLE_REMOTE_FAILURE:
478478
// any additional time here.
479479
for didContact := range fallbackCh {
480480
if didContact {
481-
m.logger.Printf("[WARN] memberlist: Was able to connect to %s but other probes failed, network may be misconfigured", node.Name)
481+
m.logger.Printf("[WARN] memberlist: Was able to connect to %s over TCP but UDP probes failed, network may be misconfigured", node.Name)
482482
return
483483
}
484484
}

0 commit comments

Comments
 (0)