Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

retry reading message with reconnect #7

Merged
merged 1 commit into from
Jan 8, 2024
Merged

retry reading message with reconnect #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 36 additions & 11 deletions Peer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ const (
sentMsg = "Sent"
receivedMsg = "Recv"

retryWriteMessageInterval = 10 * time.Second
retryWriteMessageAttempts = 5
retryReadWriteMessageInterval = 10 * time.Second
retryReadWriteMessageAttempts = 5
)

type Block struct {
Expand Down Expand Up @@ -244,6 +244,37 @@ func (p *Peer) String() string {
return p.address
}

func (p *Peer) readRetry(r io.Reader, pver uint32, bsvnet wire.BitcoinNet) (wire.Message, error) {
policy := backoff.WithMaxRetries(backoff.NewConstantBackOff(retryReadWriteMessageInterval), retryReadWriteMessageAttempts)
operation := func() (wire.Message, error) {
msg, _, err := wire.ReadMessage(r, pver, bsvnet)
if err != nil {
return nil, err
}
return msg, nil
}

notifyAndReconnect := func(err error, nextTry time.Duration) {
if errors.Is(err, io.EOF) {
p.logger.Error("Failed to read message: EOF", slog.Duration("next try", nextTry), slog.String(errKey, err.Error()))
} else {
p.logger.Error("Failed to read message", slog.Duration("next try", nextTry), slog.String(errKey, err.Error()))
}

err = p.connect()
if err != nil {
p.logger.Error("Failed to reconnect", slog.Duration("next try", nextTry), slog.String(errKey, err.Error()))
}
}

msg, err := backoff.RetryNotifyWithData(operation, policy, notifyAndReconnect)
if err != nil {
return nil, err
}

return msg, nil
}

func (p *Peer) readHandler() {
readConn := p.readConn

Expand All @@ -254,15 +285,9 @@ func (p *Peer) readHandler() {

reader := bufio.NewReader(&io.LimitedReader{R: readConn, N: p.maximumMessageSize})
for {
msg, b, err := wire.ReadMessage(reader, wire.ProtocolVersion, p.network)
msg, err := p.readRetry(reader, wire.ProtocolVersion, p.network)
if err != nil {
if errors.Is(err, io.EOF) {
p.logger.Error("failed to read message: EOF", slog.Int("bytes", len(b)), slog.String("rawMessage", string(b)), slog.String(errKey, err.Error()))
p.disconnect()
break
}

p.logger.Error("failed to read message", slog.Int("bytes", len(b)), slog.String("rawMessage", string(b)), slog.String(errKey, err.Error()))
p.logger.Error("failed to read", slog.String(errKey, err.Error()))
continue
}

Expand Down Expand Up @@ -488,7 +513,7 @@ func (p *Peer) sendDataBatch(batch []*chainhash.Hash) {
}

func (p *Peer) writeRetry(msg wire.Message) error {
policy := backoff.WithMaxRetries(backoff.NewConstantBackOff(retryWriteMessageInterval), retryWriteMessageAttempts)
policy := backoff.WithMaxRetries(backoff.NewConstantBackOff(retryReadWriteMessageInterval), retryReadWriteMessageAttempts)

operation := func() error {
return wire.WriteMessage(p.writeConn, msg, wire.ProtocolVersion, p.network)
Expand Down