1
0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-30 07:23:07 +03:00

MDEV-26266 Fix error handling around remove_fragments()

Handle the case where client_service::remove_fragments() fails,
for reasons other than bf abort. In this case, we want to make
sure that the transaction state is moved to s_must_abort, so
that we satisfy the sanity check at the end of before_prepare():

```
   assert(state() == s_preparing ||
          (is_xa() && state() == s_replaying) ||
          (ret && (state() == s_must_abort ||
                   state() == s_must_replay ||
                   state() == s_cert_failed ||
                   state() == s_aborted)));
```
This commit is contained in:
Daniele Sciascia
2024-10-09 17:31:02 +02:00
parent 31db847676
commit 1c61b809d1
3 changed files with 59 additions and 2 deletions

View File

@ -69,6 +69,7 @@ namespace wsrep
, bf_abort_during_wait_()
, bf_abort_during_fragment_removal_()
, error_during_prepare_data_()
, error_during_fragment_removal_(false)
, killed_before_certify_()
, sync_point_enabled_()
, sync_point_action_()
@ -99,10 +100,13 @@ namespace wsrep
client_state_->after_rollback();
return 1;
}
else
if (error_during_fragment_removal_)
{
return 0;
return 1;
}
return 0;
}
void will_replay() WSREP_OVERRIDE { will_replay_called_ = true; }
@ -218,6 +222,7 @@ namespace wsrep
bool bf_abort_during_wait_;
bool bf_abort_during_fragment_removal_;
bool error_during_prepare_data_;
bool error_during_fragment_removal_;
bool killed_before_certify_;
std::string sync_point_enabled_;
enum sync_point_action