From 096fc87a54d4823e7ede11affdb9db9d9ae4b1e2 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Thu, 23 Jan 2025 11:22:05 +0000 Subject: [PATCH 1/2] Handle a couple of potential errors a bit better --- src/osiris_replica.erl | 9 +++++++++ src/osiris_replica_reader.erl | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/osiris_replica.erl b/src/osiris_replica.erl index 25bd162..6dd6ccd 100644 --- a/src/osiris_replica.erl +++ b/src/osiris_replica.erl @@ -160,8 +160,17 @@ handle_continue(#{name := Name0, {error, no_process} -> ?INFO_(Name, "Writer process not alive, exiting...", []), {stop, {shutdown, writer_unavailable}, undefined}; + missing_file -> + ?INFO_(Name, "missing file returned from writer, exiting...", []), + {stop, {shutdown, missing_file}, undefined}; {error, _} = Err -> {stop, Err, undefined}; + {badrpc, {'EXIT', shutdown}} -> + ?INFO_(Name, "Writer process shutting down, exiting...", []), + {stop, {shutdown, writer_unavailable}, undefined}; + {badrpc, nodedown} -> + ?INFO_(Name, "Writer process node is down, exiting...", []), + {stop, {shutdown, writer_unavailable}, undefined}; {badrpc, Reason} -> {stop, {badrpc, Reason}, undefined}; {ok, {LeaderRange, LeaderEpochOffs}} -> diff --git a/src/osiris_replica_reader.erl b/src/osiris_replica_reader.erl index c97c2fe..19dd419 100644 --- a/src/osiris_replica_reader.erl +++ b/src/osiris_replica_reader.erl @@ -330,7 +330,9 @@ do_sendfile0(#state{name = Name, {ok, Log} -> do_sendfile0(State#state{log = Log}); {error, _Err} -> - ok = setopts(Transport, Sock, [{nopush, false}]), + %% ignore return value here as we've already hit an error + %% and it is likely we'll get another one when setting opts + _ = setopts(Transport, Sock, [{nopush, false}]), ?DEBUG_(Name, "sendfile err ~w", [_Err]), State; {end_of_stream, Log} -> From bec9c50ad243549ad766e345e4caad119c0f1e61 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Fri, 24 Jan 2025 11:34:36 +0000 Subject: [PATCH 2/2] remove bazel --- .github/workflows/erlang.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml index 40aeb06..5b0bd7c 100644 --- a/.github/workflows/erlang.yml +++ b/.github/workflows/erlang.yml @@ -29,17 +29,3 @@ jobs: run: make - name: Run tests run: make check - - build-bazel: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - otp_major: - - "26" - steps: - - name: Clone the repository - uses: actions/checkout@v2 - - name: Run tests - run: | - bazelisk test //... --config=rbe-${{ matrix.otp_major }}