lib/wsrep-lib
1
0
Fork 0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-21 12:22:06 +03:00
Code Activity

The changes:

Browse Source 
* Now the rollback of InnoDB SR transactions is not always skipped.

Now most galera_sr MTR tests succeed, including galera_sr.GCF-900.
This commit is contained in:
Pekka Lampio
2021-03-10 18:13:09 +02:00
parent 3909de3d67
commit df55a53c35
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wsrep/high_priority_service.hpp
View File

@ -144,8 +144,14 @@ namespace wsrep
* *
* @return Zero in case of success, non-zero in case of failure * @return Zero in case of success, non-zero in case of failure
*/ */
#ifdef WITH_WSREP_SR_SPEEDUP
virtual int rollback(const wsrep::ws_handle& ws_handle,
const wsrep::ws_meta& ws_meta,
bool skip_rollback = false) = 0;
#else
virtual int rollback(const wsrep::ws_handle& ws_handle, virtual int rollback(const wsrep::ws_handle& ws_handle,
const wsrep::ws_meta& ws_meta) = 0; const wsrep::ws_meta& ws_meta) = 0;
#endif /* WITH_WSREP_SR_SPEEDUP */
/** /**
* Apply a TOI operation. * Apply a TOI operation.

19
src/server_state.cpp
View File

@ -1577,6 +1577,9 @@ void wsrep::server_state::close_orphaned_sr_transactions(
void wsrep::server_state::close_transactions_at_disconnect( void wsrep::server_state::close_transactions_at_disconnect(
wsrep::high_priority_service& high_priority_service) wsrep::high_priority_service& high_priority_service)
{ {
#ifdef DEBUG_SR_SPEEDUP
wsrep::log_info() << __FUNCTION__ << "(" << __LINE__ << ")";
#endif /* DEBUG_SR_SPEEDUP */
// Close streaming applier without removing fragments // Close streaming applier without removing fragments
// from fragment storage. When the server is started again, // from fragment storage. When the server is started again,
// it must be able to recover ongoing streaming transactions. // it must be able to recover ongoing streaming transactions.
@ -1587,9 +1590,19 @@ void wsrep::server_state::close_transactions_at_disconnect(
{ {
wsrep::high_priority_switch sw(high_priority_service, wsrep::high_priority_switch sw(high_priority_service,
*streaming_applier); *streaming_applier);
streaming_applier->rollback( #ifdef DEBUG_SR_SPEEDUP
wsrep::ws_handle(), wsrep::ws_meta()); wsrep::log_info() << __FUNCTION__ << "(" << __LINE__
streaming_applier->after_apply(); << ") skipped rollback for wsrep::trx = "
<< streaming_applier->transaction().id();
#endif /* DEBUG_SR_SPEEDUP */
#ifdef WITH_WSREP_SR_SPEEDUP
streaming_applier->rollback(
wsrep::ws_handle(), wsrep::ws_meta(), true);
#else
streaming_applier->rollback(
wsrep::ws_handle(), wsrep::ws_meta());
#endif /* WITH_WSREP_SR_SPEEDUP */
streaming_applier->after_apply();
} }
streaming_appliers_.erase(i++); streaming_appliers_.erase(i++);
server_service_.release_high_priority_service(streaming_applier); server_service_.release_high_priority_service(streaming_applier);