Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion flow/connectors/mysql/cdc.go
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ func (c *MySqlConnector) PullRecords(
} else {
c.logger.Error("[mysql] PullRecords failed to get event", slog.Any("error", err))
}
return err
return exceptions.NewMySQLStreamingError(err)
}

allFetchedBytes.Add(int64(len(event.RawData)))
Expand Down
34 changes: 19 additions & 15 deletions flow/connectors/mysql/mysql.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/PeerDB-io/peerdb/flow/pkg/common"
mysql_validation "github.com/PeerDB-io/peerdb/flow/pkg/mysql"
"github.com/PeerDB-io/peerdb/flow/shared"
"github.com/PeerDB-io/peerdb/flow/shared/exceptions"
)

type MySqlConnector struct {
Expand Down Expand Up @@ -299,63 +300,66 @@ func (c *MySqlConnector) ExecuteNoRetry(ctx context.Context, cmd string, args ..
}

func (c *MySqlConnector) Execute(ctx context.Context, cmd string, args ...any) (*mysql.Result, error) {
var connectionErr error
var retryableErr error
for conn, err := range c.withRetries(ctx) {
if err != nil {
return nil, err
}

rs, err := conn.Execute(cmd, args...)
if err != nil && mysql.ErrorEqual(err, mysql.ErrBadConn) {
connectionErr = err
continue
if rs, err := conn.Execute(cmd, args...); err != nil {
if mysql.ErrorEqual(err, mysql.ErrBadConn) || exceptions.InvalidSequenceRe.MatchString(err.Error()) {
retryableErr = err
continue
}
return nil, err
} else {
return rs, nil
}
return rs, err
}
return nil, connectionErr
return nil, retryableErr
}

func (c *MySqlConnector) ExecuteSelectStreaming(ctx context.Context, cmd string, result *mysql.Result,
rowCb client.SelectPerRowCallback,
resultCb client.SelectPerResultCallback,
args ...any,
) error {
var connectionErr error
var retryableErr error
for conn, err := range c.withRetries(ctx) {
if err != nil {
return err
}

if len(args) == 0 {
if err := conn.ExecuteSelectStreaming(cmd, result, rowCb, resultCb); err != nil {
if mysql.ErrorEqual(err, mysql.ErrBadConn) {
connectionErr = err
if mysql.ErrorEqual(err, mysql.ErrBadConn) || exceptions.InvalidSequenceRe.MatchString(err.Error()) {
retryableErr = err
continue
}
return err
}
} else {
stmt, err := conn.Prepare(cmd)
if err != nil {
if mysql.ErrorEqual(err, mysql.ErrBadConn) {
connectionErr = err
if mysql.ErrorEqual(err, mysql.ErrBadConn) || exceptions.InvalidSequenceRe.MatchString(err.Error()) {
retryableErr = err
continue
}
return err
}
err = stmt.ExecuteSelectStreaming(result, rowCb, resultCb, args...)
_ = stmt.Close()
if err != nil {
if mysql.ErrorEqual(err, mysql.ErrBadConn) {
connectionErr = err
if mysql.ErrorEqual(err, mysql.ErrBadConn) || exceptions.InvalidSequenceRe.MatchString(err.Error()) {
retryableErr = err
continue
}
return err
}
}
return nil
}
return connectionErr
return retryableErr
}

func (c *MySqlConnector) GetGtidModeOn(ctx context.Context) (bool, error) {
Expand Down
12 changes: 10 additions & 2 deletions flow/shared/exceptions/mysql.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,16 @@ import (
"crypto/tls"
"errors"
"fmt"
"regexp"
"strings"

"github.com/go-mysql-org/go-mysql/mysql"
)

// InvalidSequenceRe go-mysql-org returns "invalid sequence X != Y" when the TCP packet sequence
// is out of sync — always transient, safe to retry.
var InvalidSequenceRe = regexp.MustCompile(`invalid sequence \d+ != \d+`)

type MySQLIncompatibleColumnTypeError struct {
TableName string
ColumnName string
Expand Down Expand Up @@ -72,8 +77,7 @@ func NewMySQLStreamingError(err error) *MySQLStreamingError {
return &MySQLStreamingError{err, true}
}

var recordHeaderError tls.RecordHeaderError
if errors.As(err, &recordHeaderError) {
if recordHeaderError, ok := errors.AsType[tls.RecordHeaderError](err); ok {
if recordHeaderError.Msg == "first record does not look like a TLS handshake" {
return &MySQLStreamingError{err, true}
}
Expand All @@ -83,6 +87,10 @@ func NewMySQLStreamingError(err error) *MySQLStreamingError {
return &MySQLStreamingError{err, true}
}

if InvalidSequenceRe.MatchString(err.Error()) {
return &MySQLStreamingError{err, true}
}

return &MySQLStreamingError{err, false}
}

Expand Down
Loading