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

[cdc] treat all pkms as reply_requested #2353

Merged
merged 8 commits into from
Dec 17, 2024
Merged

[cdc] treat all pkms as reply_requested #2353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5d43787
[cdc] treat all pkms as reply_requested
heavycrystal Dec 12, 2024
0e6d9ed
reduce logging
heavycrystal Dec 16, 2024
e05c2a0
Merge branch 'main' into pkm-always-replyrequested
heavycrystal Dec 17, 2024
3292a4e
more reduce logging
heavycrystal Dec 17, 2024
d528fc9
more logging LSN better
heavycrystal Dec 17, 2024
2a234d8
fix lint
heavycrystal Dec 17, 2024
227dae3
Merge branch 'main' into pkm-always-replyrequested
heavycrystal Dec 17, 2024
55c3e5e
Merge branch 'main' into pkm-always-replyrequested
heavycrystal Dec 17, 2024
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
3 changes: 2 additions & 1 deletion flow/connectors/external_metadata/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"log/slog"
"time"

"github.com/jackc/pglogrepl"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgtype"
"github.com/jackc/pgx/v5/pgxpool"
Expand Down Expand Up @@ -135,7 +136,7 @@ func (p *PostgresMetadata) GetLastNormalizeBatchID(ctx context.Context, jobName
}

func (p *PostgresMetadata) SetLastOffset(ctx context.Context, jobName string, offset int64) error {
p.logger.Info("updating last offset", "offset", offset)
p.logger.Debug("updating last offset", slog.String("offset", pglogrepl.LSN(offset).String()))
_, err := p.pool.Exec(ctx, `
INSERT INTO `+lastSyncStateTableName+` (job_name, last_offset, sync_batch_id)
VALUES ($1, $2, $3)
Expand Down
10 changes: 4 additions & 6 deletions flow/connectors/postgres/cdc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,15 +495,13 @@ func PullCdcRecords[Items model.Items](
return fmt.Errorf("ParsePrimaryKeepaliveMessage failed: %w", err)
}

logger.Debug("Primary Keepalive Message", slog.Any("data", pkm))
logger.Debug("Primary Keepalive Message", slog.Bool("replyRequested", pkm.ReplyRequested),
slog.String("ServerWALEnd", pkm.ServerWALEnd.String()), slog.String("ServerTime", pkm.ServerTime.String()))

if pkm.ServerWALEnd > clientXLogPos {
clientXLogPos = pkm.ServerWALEnd
}

if pkm.ReplyRequested {
pkmRequiresResponse = true
}
pkmRequiresResponse = true

case pglogrepl.XLogDataByteID:
xld, err := pglogrepl.ParseXLogData(msg.Data[1:])
Expand Down Expand Up @@ -704,7 +702,7 @@ func processMessage[Items model.Items](
logger.Info("LogicalDecodingMessage",
slog.Bool("Transactional", msg.Transactional),
slog.String("Prefix", msg.Prefix),
slog.Int64("LSN", int64(msg.LSN)))
slog.String("LSN", msg.LSN.String()))
if !msg.Transactional {
batch.UpdateLatestCheckpoint(int64(msg.LSN))
}
Expand Down
Loading