From da5098b622bc6f92c9265bacf4c1168fd69b38b5 Mon Sep 17 00:00:00 2001 From: Daniele Sciascia Date: Thu, 20 Jan 2022 16:49:06 +0100 Subject: [PATCH] Fix fragment removal on rollback Do not cause apply error if fragment removal fails on rollback. Instead, leave stale entries in storage, and move on. --- 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 79a720b..0a9c43f 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) { - 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); + high_priority_service.remove_fragments(ws_meta); + high_priority_service.commit(ws_handle, ws_meta); + high_priority_service.after_apply(); } else {