lib/wsrep-lib
1
0
Fork 0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-28 20:02:00 +03:00
Code Activity

Minimize client_service interface for XA

Browse Source 
Remove methods `is_xa()`, `is_xa_prepare()`, and `xid()` from
client_service interface. Instead, transactions are explicitly
assigned their xid, through at start of XA.
This commit is contained in:
Daniele Sciascia
2019-07-30 11:25:38 +02:00
parent 052247144f
commit 5d18ce3e75
7 changed files with 85 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/transaction.cpp
View File

@ -108,7 +108,7 @@ wsrep::transaction::transaction(
, streaming_context_()
, sr_keys_()
, apply_error_buf_()
, is_recovered_xa_(false)
, xid_()
{ }
@ -121,6 +121,7 @@ int wsrep::transaction::start_transaction(
{
debug_log_state("start_transaction enter");
assert(active() == false);
assert(is_xa() == false);
assert(flags() == 0);
server_id_ = client_state_.server_state().id();
id_ = id;
@ -323,7 +324,10 @@ int wsrep::transaction::before_prepare(
{
if (is_xa())
{
ret = streaming_step(lock);
// Force fragment replication on XA prepare
flags(flags() | wsrep::provider::flag::prepare);
const bool force_streaming_step = true;
ret = streaming_step(lock, force_streaming_step);
if (ret == 0)
{
assert(state() == s_executing);
@ -568,7 +572,7 @@ int wsrep::transaction::after_commit()
assert(client_state_.mode() == wsrep::client_state::m_local ||
client_state_.mode() == wsrep::client_state::m_high_priority);
if (is_xa() || is_recovered_xa_)
if (is_xa())
{
// XA fragment removal happens here,
// see comment in before_prepare
@ -1036,7 +1040,7 @@ void wsrep::transaction::after_replay(const wsrep::transaction& other)
clear_fragments();
}
int wsrep::transaction::restore_to_prepared_state()
int wsrep::transaction::restore_to_prepared_state(const std::string& xid)
{
wsrep::unique_lock<wsrep::mutex> lock(client_state_.mutex_);
assert(active());
@ -1045,7 +1049,7 @@ int wsrep::transaction::restore_to_prepared_state()
flags(flags() & ~wsrep::provider::flag::start_transaction);
state(lock, s_certifying);
state(lock, s_prepared);
is_recovered_xa_ = true;
xid_ = xid;
return 0;
}
@ -1198,7 +1202,8 @@ bool wsrep::transaction::abort_or_interrupt(
return false;
}
int wsrep::transaction::streaming_step(wsrep::unique_lock<wsrep::mutex>& lock)
int wsrep::transaction::streaming_step(wsrep::unique_lock<wsrep::mutex>& lock,
bool force)
{
assert(lock.owns_lock());
assert(streaming_context_.fragment_size() || is_xa());
@ -1232,18 +1237,19 @@ int wsrep::transaction::streaming_step(wsrep::unique_lock<wsrep::mutex>& lock)
break;
}
if (streaming_context_.fragment_size_exceeded() || is_xa_prepare())
// Some statements have no effect. Do not atttempt to
// replicate a fragment if no data has been generated since
// last fragment replication.
// We use `force = true` on XA prepare: a fragment will be
// generated even if no data is pending replication.
if (bytes_to_replicate <= 0 && !force)
{
// Some statements have no effect. Do not atttempt to
// replicate a fragment if no data has been generated since
// last fragment replication. A XA PREPARE statement generates a
// fragment even if no data is currently pending replication.
if (bytes_to_replicate <= 0 && !is_xa_prepare())
{
assert(bytes_to_replicate == 0);
return ret;
}
assert(bytes_to_replicate == 0);
return ret;
}
if (streaming_context_.fragment_size_exceeded() || force)
{
streaming_context_.reset_unit_counter();
ret = certify_fragment(lock);
}
@ -1307,11 +1313,6 @@ int wsrep::transaction::certify_fragment(
flags(flags() | wsrep::provider::flag::implicit_deps);
}
if (is_xa_prepare())
{
flags(flags() | wsrep::provider::flag::prepare);
}
int ret(0);
enum wsrep::client_error error(wsrep::e_success);
enum wsrep::provider::status cert_ret(wsrep::provider::success);
@ -1746,7 +1747,7 @@ void wsrep::transaction::cleanup()
streaming_context_.cleanup();
client_service_.cleanup_transaction();
apply_error_buf_.clear();
is_recovered_xa_ = false;
xid_.clear();
debug_log_state("cleanup_leave");
}