[Tarantool-patches] [RFC v6 2/3] limbo: order access to the limbo terms terms
Cyrill Gorcunov
gorcunov at gmail.com
Sat Jul 17 00:19:45 MSK 2021
Limbo terms tracking is shared between appliers and when
one of appliers is waiting for write to complete inside
journal_write() routine, an other may need to access read
term value to figure out if promote request is valid to
apply. Due to cooperative multitasking access to the terms
is not consistent so we need to be sure that other fibers
either read up to date terms (ie written to the WAL).
For this sake we use latching mechanism, when one fiber
took terms-lock for updating other readers are waiting
until the operation is complete.
For example here is a call graph of two appliers
applier 1
---------
applier_apply_tx
(promote term = 3
current max term = 2)
applier_synchro_filter_tx
apply_synchro_row
journal_write
(sleeping)
at this moment another applier comes in with obsolete
data and term 2
applier 2
---------
applier_apply_tx
(term 2)
applier_synchro_filter_tx
txn_limbo_is_replica_outdated -> false
journal_write (sleep)
applier 1
---------
journal wakes up
apply_synchro_row_cb
set max term to 3
So the applier 2 didn't notice that term 3 is already seen
and wrote obsolete data. With locking the applier 2 will
wait until applier 1 has finished its write.
Part-of #6036
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
---
src/box/applier.cc | 10 ++++--
src/box/box.cc | 16 ++++------
src/box/txn_limbo.c | 17 +++++++++--
src/box/txn_limbo.h | 74 ++++++++++++++++++++++++++++++++++++++++++---
4 files changed, 97 insertions(+), 20 deletions(-)
diff --git a/src/box/applier.cc b/src/box/applier.cc
index 92ec088ea..765ffc670 100644
--- a/src/box/applier.cc
+++ b/src/box/applier.cc
@@ -854,7 +854,7 @@ apply_synchro_row_cb(struct journal_entry *entry)
applier_rollback_by_wal_io(entry->res);
} else {
replica_txn_wal_write_cb(synchro_entry->rcb);
- txn_limbo_process(&txn_limbo, synchro_entry->req);
+ txn_limbo_process_locked(&txn_limbo, synchro_entry->req);
trigger_run(&replicaset.applier.on_wal_write, NULL);
}
fiber_wakeup(synchro_entry->owner);
@@ -870,6 +870,7 @@ apply_synchro_row(uint32_t replica_id, struct xrow_header *row)
if (xrow_decode_synchro(row, &req) != 0)
goto err;
+ txn_limbo_terms_lock(&txn_limbo);
struct replica_cb_data rcb_data;
struct synchro_entry entry;
/*
@@ -907,12 +908,15 @@ apply_synchro_row(uint32_t replica_id, struct xrow_header *row)
* transactions side, including the async ones.
*/
if (journal_write(&entry.base) != 0)
- goto err;
+ goto err_unlock;
if (entry.base.res < 0) {
diag_set_journal_res(entry.base.res);
- goto err;
+ goto err_unlock;
}
+ txn_limbo_terms_unlock(&txn_limbo);
return 0;
+err_unlock:
+ txn_limbo_terms_unlock(&txn_limbo);
err:
diag_log();
return -1;
diff --git a/src/box/box.cc b/src/box/box.cc
index 64db2680a..e590df425 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -1573,8 +1573,7 @@ box_run_elections(void)
static int
box_check_promote_term_changed(uint64_t promote_term)
{
- const struct txn_limbo_terms *tr = &txn_limbo.terms;
- if (tr->terms_max != promote_term) {
+ if (txn_limbo_terms_max_raw(&txn_limbo) != promote_term) {
diag_set(ClientError, ER_INTERFERING_PROMOTE,
txn_limbo.owner_id);
return -1;
@@ -1586,8 +1585,7 @@ box_check_promote_term_changed(uint64_t promote_term)
static int
box_trigger_elections(void)
{
- const struct txn_limbo_terms *tr = &txn_limbo.terms;
- uint64_t promote_term = tr->terms_max;
+ uint64_t promote_term = txn_limbo_terms_max_raw(&txn_limbo);
raft_new_term(box_raft());
if (box_raft_wait_term_persisted() < 0)
return -1;
@@ -1598,8 +1596,7 @@ box_trigger_elections(void)
static int
box_try_wait_confirm(double timeout)
{
- const struct txn_limbo_terms *tr = &txn_limbo.terms;
- uint64_t promote_term = tr->terms_max;
+ uint64_t promote_term = txn_limbo_terms_max_raw(&txn_limbo);
txn_limbo_wait_empty(&txn_limbo, timeout);
return box_check_promote_term_changed(promote_term);
}
@@ -1615,8 +1612,7 @@ box_wait_limbo_acked(void)
if (txn_limbo_is_empty(&txn_limbo))
return txn_limbo.confirmed_lsn;
- const struct txn_limbo_terms *tr = &txn_limbo.terms;
- uint64_t promote_term = tr->terms_max;
+ uint64_t promote_term = txn_limbo_terms_max_raw(&txn_limbo);
int quorum = replication_synchro_quorum;
struct txn_limbo_entry *last_entry;
last_entry = txn_limbo_last_synchro_entry(&txn_limbo);
@@ -1753,7 +1749,7 @@ box_promote(void)
* Currently active leader (the instance that is seen as leader by both
* raft and txn_limbo) can't issue another PROMOTE.
*/
- bool is_leader = txn_limbo_replica_term(&txn_limbo, instance_id) ==
+ bool is_leader = txn_limbo_term(&txn_limbo, instance_id) ==
box_raft()->term && txn_limbo.owner_id == instance_id;
if (box_election_mode != ELECTION_MODE_OFF)
is_leader = is_leader && box_raft()->state == RAFT_STATE_LEADER;
@@ -1802,7 +1798,7 @@ box_demote(void)
return 0;
/* Currently active leader is the only one who can issue a DEMOTE. */
- bool is_leader = txn_limbo_replica_term(&txn_limbo, instance_id) ==
+ bool is_leader = txn_limbo_term(&txn_limbo, instance_id) ==
box_raft()->term && txn_limbo.owner_id == instance_id;
if (box_election_mode != ELECTION_MODE_OFF)
is_leader = is_leader && box_raft()->state == RAFT_STATE_LEADER;
diff --git a/src/box/txn_limbo.c b/src/box/txn_limbo.c
index 53c86f34e..437cf199b 100644
--- a/src/box/txn_limbo.c
+++ b/src/box/txn_limbo.c
@@ -40,6 +40,7 @@ struct txn_limbo txn_limbo;
static void
txn_limbo_terms_create(struct txn_limbo_terms *tr)
{
+ latch_create(&tr->latch);
vclock_create(&tr->terms_map);
tr->terms_max = 0;
}
@@ -731,12 +732,14 @@ txn_limbo_wait_empty(struct txn_limbo *limbo, double timeout)
}
void
-txn_limbo_process(struct txn_limbo *limbo, const struct synchro_request *req)
+txn_limbo_process_locked(struct txn_limbo *limbo,
+ const struct synchro_request *req)
{
struct txn_limbo_terms *tr = &limbo->terms;
uint64_t term = req->term;
uint32_t origin = req->origin_id;
- if (txn_limbo_replica_term(limbo, origin) < term) {
+
+ if (txn_limbo_term_locked(limbo, origin) < term) {
vclock_follow(&tr->terms_map, origin, term);
if (term > tr->terms_max)
tr->terms_max = term;
@@ -794,6 +797,16 @@ txn_limbo_process(struct txn_limbo *limbo, const struct synchro_request *req)
return;
}
+void
+txn_limbo_process(struct txn_limbo *limbo,
+ const struct synchro_request *req)
+{
+ txn_limbo_terms_lock(limbo);
+ txn_limbo_process_locked(limbo, req);
+ txn_limbo_terms_unlock(limbo);
+ return 0;
+}
+
void
txn_limbo_on_parameters_change(struct txn_limbo *limbo)
{
diff --git a/src/box/txn_limbo.h b/src/box/txn_limbo.h
index dc980bf7c..45687381f 100644
--- a/src/box/txn_limbo.h
+++ b/src/box/txn_limbo.h
@@ -31,6 +31,7 @@
*/
#include "small/rlist.h"
#include "vclock/vclock.h"
+#include "latch.h"
#include <stdint.h>
@@ -80,6 +81,10 @@ txn_limbo_entry_is_complete(const struct txn_limbo_entry *e)
* situation and other errors.
*/
struct txn_limbo_terms {
+ /**
+ * To order access to the promote data.
+ */
+ struct latch latch;
/**
* Latest terms received with PROMOTE entries from remote instances.
* Limbo uses them to filter out the transactions coming not from the
@@ -222,15 +227,66 @@ txn_limbo_last_entry(struct txn_limbo *limbo)
in_queue);
}
+/** Lock promote data. */
+static inline void
+txn_limbo_terms_lock(struct txn_limbo *limbo)
+{
+ struct txn_limbo_terms *tr = &limbo->terms;
+ latch_lock(&tr->latch);
+}
+
+/** Unlock promote data. */
+static void
+txn_limbo_terms_unlock(struct txn_limbo *limbo)
+{
+ struct txn_limbo_terms *tr = &limbo->terms;
+ latch_unlock(&tr->latch);
+}
+
+/** Test if promote data is locked. */
+static inline bool
+txn_limbo_terms_is_locked(const struct txn_limbo *limbo)
+{
+ const struct txn_limbo_terms *tr = &limbo->terms;
+ return latch_is_locked(&tr->latch);
+}
+
+/** Fetch replica's term with lock taken. */
+static inline uint64_t
+txn_limbo_term_locked(struct txn_limbo *limbo, uint32_t replica_id)
+{
+ const struct txn_limbo_terms *tr = &limbo->terms;
+ panic_on(!txn_limbo_terms_is_locked(limbo),
+ "limbo: unlocked term read for replica %u",
+ replica_id);
+ return vclock_get(&tr->terms_map, replica_id);
+}
+
/**
* Return the latest term as seen in PROMOTE requests from instance with id
* @a replica_id.
*/
static inline uint64_t
-txn_limbo_replica_term(const struct txn_limbo *limbo, uint32_t replica_id)
+txn_limbo_term(struct txn_limbo *limbo, uint32_t replica_id)
+{
+ txn_limbo_terms_lock(limbo);
+ uint64_t v = txn_limbo_term_locked(limbo, replica_id);
+ txn_limbo_terms_unlock(limbo);
+ return v;
+}
+
+/**
+ * Fiber's preempt not safe read of @a terms_max.
+ *
+ * Use it if you're interested in current value
+ * only and ready that the value is getting updated
+ * if after the read yield happens.
+ */
+static inline uint64_t
+txn_limbo_terms_max_raw(struct txn_limbo *limbo)
{
const struct txn_limbo_terms *tr = &limbo->terms;
- return vclock_get(&tr->terms_map, replica_id);
+ return tr->terms_max;
}
/**
@@ -238,12 +294,15 @@ txn_limbo_replica_term(const struct txn_limbo *limbo, uint32_t replica_id)
* data from it. The check is only valid when elections are enabled.
*/
static inline bool
-txn_limbo_is_replica_outdated(const struct txn_limbo *limbo,
+txn_limbo_is_replica_outdated(struct txn_limbo *limbo,
uint32_t replica_id)
{
const struct txn_limbo_terms *tr = &limbo->terms;
- return txn_limbo_replica_term(limbo, replica_id) <
- tr->terms_max;
+ txn_limbo_terms_lock(limbo);
+ bool res = txn_limbo_term_locked(limbo, replica_id) <
+ tr->terms_max;
+ txn_limbo_terms_unlock(limbo);
+ return res;
}
/**
@@ -315,6 +374,11 @@ txn_limbo_wait_complete(struct txn_limbo *limbo, struct txn_limbo_entry *entry);
/** Execute a synchronous replication request. */
void
+txn_limbo_process_locked(struct txn_limbo *limbo,
+ const struct synchro_request *req);
+
+/** Lock limbo terms and execute a synchronous replication request. */
+void
txn_limbo_process(struct txn_limbo *limbo, const struct synchro_request *req);
/**
--
2.31.1
More information about the Tarantool-patches
mailing list