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.

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

Ack the WAL Keep-Alives #1905

Merged
merged 4 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
5 changes: 5 additions & 0 deletions .changeset/eight-pugs-guess.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@core/sync-service": patch
---

Update acknowledged WAL on keep alive messages
Original file line number Diff line number Diff line change
Expand Up @@ -192,13 +192,14 @@ defmodule Electric.Postgres.ReplicationClient do
"Primary Keepalive: wal_end=#{wal_end} (#{Lsn.from_integer(wal_end)}) reply=#{reply}"
end)

messages =
case reply do
1 -> [encode_standby_status_update(state)]
0 -> []
end
case reply do
1 ->
state = update_applied_wal(state, wal_end)
{:noreply, [encode_standby_status_update(state)], state}

{:noreply, messages, state}
0 ->
{:noreply, [], state}
end
end

defp process_x_log_data(data, wal_end, %State{} = state) do
Expand Down Expand Up @@ -289,6 +290,6 @@ defmodule Electric.Postgres.ReplicationClient do
@epoch DateTime.to_unix(~U[2000-01-01 00:00:00Z], :microsecond)
defp current_time(), do: System.os_time(:microsecond) - @epoch

defp update_applied_wal(state, wal) when wal > state.applied_wal,
defp update_applied_wal(state, wal) when wal >= state.applied_wal,
do: %{state | applied_wal: wal}
end
Original file line number Diff line number Diff line change
Expand Up @@ -329,12 +329,6 @@ defmodule Electric.Postgres.ReplicationClientTest do
connection_manager: ctx.dummy_pid
)

# All offsets are 0+1 until we've processed a transaction and bumped `state.applied_wal`.
assert {:noreply, [<<?r, 1::64, 1::64, 1::64, _time::64, 0::8>>], state} =
ReplicationClient.handle_data(<<?k, pg_wal::64, 0::64, 1::8>>, state)

###

state = %{state | applied_wal: lsn_to_wal("0/10")}

assert {:noreply, [<<?r, app_wal::64, app_wal::64, app_wal::64, _time::64, 0::8>>], state} =
Expand Down
Loading