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

enter_toi polling fix

Browse Source
This commit is contained in:
Leandro Pacheco
2019-09-19 10:03:39 -03:00
committed by Teemu Ollakka
parent 8e37727a27
commit 57523eea75
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/client_state.cpp
View File

@@ -350,12 +350,14 @@ wsrep::client_state::poll_enter_toi(
<< wait_until.time_since_epoch().count()); << wait_until.time_since_epoch().count());
enum wsrep::provider::status status; enum wsrep::provider::status status;
timed_out = false; timed_out = false;
wsrep::ws_meta poll_meta; // tmp var for polling, as enter_toi may clear meta arg on errors
do do
{ {
lock.unlock(); lock.unlock();
status = provider().enter_toi(id_, keys, buffer, meta, flags); poll_meta = meta;
status = provider().enter_toi(id_, keys, buffer, poll_meta, flags);
if (status != wsrep::provider::success && if (status != wsrep::provider::success &&
not toi_meta_.gtid().is_undefined()) not poll_meta.gtid().is_undefined())
{ {
// Successfully entered TOI, but the provider reported failure. // Successfully entered TOI, but the provider reported failure.
// This may happen for example if certification fails. // This may happen for example if certification fails.
@@ -366,7 +368,7 @@ wsrep::client_state::poll_enter_toi(
<< "Failed to leave TOI after failure in " << "Failed to leave TOI after failure in "
<< "poll_enter_toi()"; << "poll_enter_toi()";
} }
toi_meta_ = wsrep::ws_meta(); poll_meta = wsrep::ws_meta();
} }
if (status == wsrep::provider::error_certification_failed || if (status == wsrep::provider::error_certification_failed ||
status == wsrep::provider::error_connection_failed) status == wsrep::provider::error_connection_failed)
@@ -381,6 +383,7 @@ wsrep::client_state::poll_enter_toi(
status == wsrep::provider::error_connection_failed) && status == wsrep::provider::error_connection_failed) &&
not timed_out && not timed_out &&
not client_service_.interrupted(lock)); not client_service_.interrupted(lock));
meta = poll_meta;
return status; return status;
} }