-
Notifications
You must be signed in to change notification settings - Fork 97
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.
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
Wrap get current LSN in txn as pgx will retry #2284
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,7 @@ import ( | |
"fmt" | ||
"log/slog" | ||
"strings" | ||
"time" | ||
|
||
"github.com/jackc/pgerrcode" | ||
"github.com/jackc/pglogrepl" | ||
|
@@ -643,15 +644,76 @@ func (c *PostgresConnector) getTableNametoUnchangedCols( | |
return resultMap, nil | ||
} | ||
|
||
func (c *PostgresConnector) executeReadOnlyTxn(ctx context.Context, fn func(tx pgx.Tx) error) error { | ||
tx, err := c.conn.BeginTx(ctx, pgx.TxOptions{IsoLevel: pgx.ReadCommitted, AccessMode: pgx.ReadOnly}) | ||
if err != nil { | ||
return fmt.Errorf("failed to begin transaction: %w", err) | ||
} | ||
|
||
defer func() { | ||
if rollbackErr := tx.Rollback(ctx); rollbackErr != nil && rollbackErr != pgx.ErrTxClosed { | ||
c.logger.Error("rollback failed", slog.Any("error", rollbackErr)) | ||
} | ||
}() | ||
|
||
if err := fn(tx); err != nil { | ||
return fmt.Errorf("transaction function execution failed: %w", err) | ||
} | ||
|
||
if err := tx.Commit(ctx); err != nil { | ||
return fmt.Errorf("failed to commit transaction: %w", err) | ||
} | ||
|
||
return nil | ||
} | ||
|
||
func (c *PostgresConnector) inRetryableReadOnlyTxn(ctx context.Context, fn func(tx pgx.Tx) error) error { | ||
var lastErr error | ||
const maxRetries = 3 | ||
const retryDelay = 5 * time.Second | ||
|
||
for range maxRetries { | ||
if err := c.executeReadOnlyTxn(ctx, fn); err != nil { | ||
lastErr = err | ||
if ctx.Err() != nil { | ||
return ctx.Err() | ||
} | ||
time.Sleep(retryDelay) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this will give an extra sleep on last try |
||
continue | ||
} | ||
return nil | ||
} | ||
|
||
return fmt.Errorf("transaction failed after %d retries: %w", maxRetries, lastErr) | ||
} | ||
|
||
func (c *PostgresConnector) getCurrentLSN(ctx context.Context) (pglogrepl.LSN, error) { | ||
row := c.conn.QueryRow(ctx, | ||
"SELECT CASE WHEN pg_is_in_recovery() THEN pg_last_wal_receive_lsn() ELSE pg_current_wal_lsn() END") | ||
var result pgtype.Text | ||
err := row.Scan(&result) | ||
var lsn pglogrepl.LSN | ||
err := c.inRetryableReadOnlyTxn(ctx, func(tx pgx.Tx) error { | ||
query := ` | ||
SELECT CASE | ||
WHEN pg_is_in_recovery() THEN pg_last_wal_receive_lsn() | ||
ELSE pg_current_wal_lsn() | ||
END` | ||
|
||
var lsnString string | ||
if err := tx.QueryRow(ctx, query).Scan(&lsnString); err != nil { | ||
return fmt.Errorf("query failed: %w", err) | ||
} | ||
|
||
parsedLSN, err := pglogrepl.ParseLSN(lsnString) | ||
if err != nil { | ||
return fmt.Errorf("invalid LSN format - %s: %w", lsnString, err) | ||
} | ||
lsn = parsedLSN | ||
return nil | ||
}) | ||
|
||
if err != nil { | ||
return 0, fmt.Errorf("error while running query: %w", err) | ||
return 0, err | ||
} | ||
return pglogrepl.ParseLSN(result.String) | ||
|
||
return lsn, nil | ||
} | ||
|
||
func (c *PostgresConnector) getDefaultPublicationName(jobName string) string { | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this accomplishes what you want still, you need to reconnect on net errors. Since retry logic of pgx exists in the pooling code
At that point there's no benefit to starting read only transaction since we aren't dealing with pooling