From 88c3b2609dd35353a8e312367157c388b7764fd4 Mon Sep 17 00:00:00 2001 From: Daniele Sciascia Date: Wed, 26 Jan 2022 16:50:52 +0100 Subject: [PATCH] Revert "Fix fragment removal on rollback" It turns out that avoiding apply error on fragment removal failure, is not a safe thing to do. If the DBMS restarts, with a entry in the streaming log storage, it may be recovered by creating a corresponding streaming applier. This reverts commit da5098b622bc6f92c9265bacf4c1168fd69b38b5. --- src/server_state.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server_state.cpp b/src/server_state.cpp index 0a9c43f..79a720b 100644 --- a/src/server_state.cpp +++ b/src/server_state.cpp @@ -249,9 +249,9 @@ static int rollback_fragment(wsrep::server_state& server_state, { if (remove_fragments) { - high_priority_service.remove_fragments(ws_meta); - high_priority_service.commit(ws_handle, ws_meta); - high_priority_service.after_apply(); + ret = high_priority_service.remove_fragments(ws_meta); + ret = ret || high_priority_service.commit(ws_handle, ws_meta); + ret = ret || (high_priority_service.after_apply(), 0); } else {