diff --git a/src/box/applier.cc b/src/box/applier.cc
index 10cea26a778107f71274e171988ae551af80c419..ee5c05c0da2ad61b400e2364d2828565cc8b2072 100644
--- a/src/box/applier.cc
+++ b/src/box/applier.cc
@@ -1029,21 +1029,24 @@ nopify:;
* Return 0 for success or -1 in case of an error.
*/
static int
-applier_apply_tx(struct applier *applier, struct stailq *rows)
+applier_apply_tx(struct stailq *rows)
{
/*
- * Rows received not directly from a leader are ignored. That is a
- * protection against the case when an old leader keeps sending data
- * around not knowing yet that it is not a leader anymore.
+ * Initially we've been filtering out data if it came from
+ * an applier which instance_id doesn't match raft->leader,
+ * but this prevents from obtaining valid leader's data when
+ * it comes from intermediate node. For example a series of
+ * replica hops
*
- * XXX: it may be that this can be fine to apply leader transactions by
- * looking at their replica_id field if it is equal to leader id. That
- * can be investigated as an 'optimization'. Even though may not give
- * anything, because won't change total number of rows sent in the
- * network anyway.
+ * master -> replica 1 -> replica 2
+ *
+ * where each replica carries master's initiated transaction
+ * in xrow->replica_id field and master's data get propagated
+ * indirectly.
+ *
+ * Finally we dropped such "sender" filtration and use transaction
+ * "initiator" filtration via xrow->replica_id only.
*/
- if (!raft_is_source_allowed(box_raft(), applier->instance_id))
- return 0;
struct xrow_header *first_row = &stailq_first_entry(rows,
struct applier_tx_row, next)->row;
struct xrow_header *last_row;
@@ -1314,7 +1317,7 @@ applier_subscribe(struct applier *applier)
diag_raise();
}
applier_signal_ack(applier);
- } else if (applier_apply_tx(applier, &rows) != 0) {
+ } else if (applier_apply_tx(&rows) != 0) {
diag_raise();
}
diff --git a/src/lib/raft/raft.h b/src/lib/raft/raft.h
index a8da564b0139b72ac1f6bf5bf0381214a841e4d7..fae30b03d885891203279ea30e241d236fbc91b4 100644
--- a/src/lib/raft/raft.h
+++ b/src/lib/raft/raft.h
@@ -236,13 +236,6 @@ raft_is_ro(const struct raft *raft)
return raft->is_enabled && raft->state != RAFT_STATE_LEADER;
}
-/** See if the instance can accept rows from an instance with the given ID. */
-static inline bool
-raft_is_source_allowed(const struct raft *raft, uint32_t source_id)
-{
- return !raft->is_enabled || raft->leader == source_id;
-}
-
/** Check if Raft is enabled. */
static inline bool
raft_is_enabled(const struct raft *raft)
diff --git a/test/replication/gh-5445-leader-inconsistency.result b/test/replication/gh-5445-leader-inconsistency.result
index 5c6169f504b6921a704f248df695b228602ec708..8b9a4051a6c7c6edbd979b83b9ed6748cde39790 100644
--- a/test/replication/gh-5445-leader-inconsistency.result
+++ b/test/replication/gh-5445-leader-inconsistency.result
@@ -178,6 +178,14 @@ test_run:cmd('stop server '..leader)
is_possible_leader[leader_nr] = false
| ---
| ...
+-- And other node as well.
+test_run:cmd('stop server '..other)
+ | ---
+ | - true
+ | ...
+is_possible_leader[other_nr] = false
+ | ---
+ | ...
-- Emulate a situation when next_leader wins the elections. It can't do that in
-- this configuration, obviously, because it's behind the 'other' node, so set
@@ -195,6 +203,13 @@ assert(get_leader(is_possible_leader) == next_leader_nr)
| ---
| - true
| ...
+test_run:cmd('start server '..other..' with args="1 0.4 voter 2"')
+ | ---
+ | - true
+ | ...
+is_possible_leader[other_nr] = true
+ | ---
+ | ...
test_run:switch(other)
| ---
| - true
diff --git a/test/replication/gh-5445-leader-inconsistency.test.lua b/test/replication/gh-5445-leader-inconsistency.test.lua
index e7952f5facd72e96cd29bf709f1d6bea81074469..b0b8baf364530a1188aadcc3d6b2f21891175ff0 100644
--- a/test/replication/gh-5445-leader-inconsistency.test.lua
+++ b/test/replication/gh-5445-leader-inconsistency.test.lua
@@ -82,6 +82,9 @@ test_run:wait_cond(function() return box.space.test:get{2} ~= nil end)
test_run:switch('default')
test_run:cmd('stop server '..leader)
is_possible_leader[leader_nr] = false
+-- And other node as well.
+test_run:cmd('stop server '..other)
+is_possible_leader[other_nr] = false
-- Emulate a situation when next_leader wins the elections. It can't do that in
-- this configuration, obviously, because it's behind the 'other' node, so set
@@ -93,6 +96,8 @@ is_possible_leader[leader_nr] = false
-- a situation when some rows from the old leader were not received).
test_run:cmd('start server '..next_leader..' with args="1 0.4 candidate 1"')
assert(get_leader(is_possible_leader) == next_leader_nr)
+test_run:cmd('start server '..other..' with args="1 0.4 voter 2"')
+is_possible_leader[other_nr] = true
test_run:switch(other)
-- New leader didn't know about the unconfirmed rows but still rolled them back.
test_run:wait_cond(function() return box.space.test:get{2} == nil end)
diff --git a/test/replication/gh-6035-election-filter.result b/test/replication/gh-6035-election-filter.result
new file mode 100644
index 0000000000000000000000000000000000000000..2fa593267b5aac2185876d5a7195e32d6b7d4900
--- /dev/null
+++ b/test/replication/gh-6035-election-filter.result
@@ -0,0 +1,139 @@
+-- test-run result file version 2
+--
+-- gh-6035: verify synchronous rows filtration in applier,
+-- we need to be sure that filtering synchronous rows is
+-- done via transaction initiator not sender (iow via
+-- xrow->replica_id).
+--
+test_run = require('test_run').new()
+ | ---
+ | ...
+
+--
+-- Prepare a scheme with transitional node
+--
+-- master <=> replica1 => replica2
+--
+-- such as transaction initiated on the master node would
+-- be replicated to the replica2 via interim replica1 node.
+--
+
+test_run:cmd('create server master with script="replication/gh-6035-master.lua"')
+ | ---
+ | - true
+ | ...
+test_run:cmd('create server replica1 with script="replication/gh-6035-replica1.lua"')
+ | ---
+ | - true
+ | ...
+test_run:cmd('create server replica2 with script="replication/gh-6035-replica2.lua"')
+ | ---
+ | - true
+ | ...
+
+test_run:cmd('start server master')
+ | ---
+ | - true
+ | ...
+test_run:cmd('start server replica1')
+ | ---
+ | - true
+ | ...
+test_run:cmd('start server replica2')
+ | ---
+ | - true
+ | ...
+
+test_run:switch('replica2')
+ | ---
+ | - true
+ | ...
+box.cfg({replication = {"unix/:./replica1.sock"}})
+ | ---
+ | ...
+
+--
+-- Make the master to be RAFT leader.
+test_run:switch('master')
+ | ---
+ | - true
+ | ...
+box.cfg({ \
+ replication = { \
+ "unix/:./master.sock", \
+ "unix/:./replica1.sock", \
+ }, \
+ replication_synchro_quorum = 2, \
+ election_mode = 'manual', \
+})
+ | ---
+ | ...
+
+box.ctl.promote()
+ | ---
+ | ...
+_ = box.schema.space.create("sync", {is_sync = true})
+ | ---
+ | ...
+_ = box.space.sync:create_index("pk")
+ | ---
+ | ...
+box.space.sync:insert{1}
+ | ---
+ | - [1]
+ | ...
+
+--
+-- The first hop is replica1.
+test_run:switch('replica1')
+ | ---
+ | - true
+ | ...
+box.space.sync:select{}
+ | ---
+ | - - [1]
+ | ...
+
+--
+-- And the second hop is replica2 where
+-- replica1 replicated the data to us.
+test_run:switch('replica2')
+ | ---
+ | - true
+ | ...
+test_run:wait_lsn('replica2', 'master')
+ | ---
+ | ...
+box.space.sync:select{}
+ | ---
+ | - - [1]
+ | ...
+
+test_run:switch('default')
+ | ---
+ | - true
+ | ...
+test_run:cmd('stop server master')
+ | ---
+ | - true
+ | ...
+test_run:cmd('delete server master')
+ | ---
+ | - true
+ | ...
+test_run:cmd('stop server replica1')
+ | ---
+ | - true
+ | ...
+test_run:cmd('delete server replica1')
+ | ---
+ | - true
+ | ...
+test_run:cmd('stop server replica2')
+ | ---
+ | - true
+ | ...
+test_run:cmd('delete server replica2')
+ | ---
+ | - true
+ | ...
diff --git a/test/replication/gh-6035-election-filter.test.lua b/test/replication/gh-6035-election-filter.test.lua
new file mode 100644
index 0000000000000000000000000000000000000000..716c84bb6e3575917950e27adef0840185667902
--- /dev/null
+++ b/test/replication/gh-6035-election-filter.test.lua
@@ -0,0 +1,64 @@
+--
+-- gh-6035: verify synchronous rows filtration in applier,
+-- we need to be sure that filtering synchronous rows is
+-- done via transaction initiator not sender (iow via
+-- xrow->replica_id).
+--
+test_run = require('test_run').new()
+
+--
+-- Prepare a scheme with transitional node
+--
+-- master <=> replica1 => replica2
+--
+-- such as transaction initiated on the master node would
+-- be replicated to the replica2 via interim replica1 node.
+--
+
+test_run:cmd('create server master with script="replication/gh-6035-master.lua"')
+test_run:cmd('create server replica1 with script="replication/gh-6035-replica1.lua"')
+test_run:cmd('create server replica2 with script="replication/gh-6035-replica2.lua"')
+
+test_run:cmd('start server master')
+test_run:cmd('start server replica1')
+test_run:cmd('start server replica2')
+
+test_run:switch('replica2')
+box.cfg({replication = {"unix/:./replica1.sock"}})
+
+--
+-- Make the master to be RAFT leader.
+test_run:switch('master')
+box.cfg({ \
+ replication = { \
+ "unix/:./master.sock", \
+ "unix/:./replica1.sock", \
+ }, \
+ replication_synchro_quorum = 2, \
+ election_mode = 'manual', \
+})
+
+box.ctl.promote()
+_ = box.schema.space.create("sync", {is_sync = true})
+_ = box.space.sync:create_index("pk")
+box.space.sync:insert{1}
+
+--
+-- The first hop is replica1.
+test_run:switch('replica1')
+box.space.sync:select{}
+
+--
+-- And the second hop is replica2 where
+-- replica1 replicated the data to us.
+test_run:switch('replica2')
+test_run:wait_lsn('replica2', 'master')
+box.space.sync:select{}
+
+test_run:switch('default')
+test_run:cmd('stop server master')
+test_run:cmd('delete server master')
+test_run:cmd('stop server replica1')
+test_run:cmd('delete server replica1')
+test_run:cmd('stop server replica2')
+test_run:cmd('delete server replica2')
diff --git a/test/replication/gh-6035-master.lua b/test/replication/gh-6035-master.lua
new file mode 120000
index 0000000000000000000000000000000000000000..f7ede7ef2036136936cba51ab0baf874bc80d59f
--- /dev/null
+++ b/test/replication/gh-6035-master.lua
@@ -0,0 +1 @@
+gh-6035-node.lua
\ No newline at end of file
diff --git a/test/replication/gh-6035-node.lua b/test/replication/gh-6035-node.lua
new file mode 100644
index 0000000000000000000000000000000000000000..819a2033200e477f0e8e6c23a2325f7d06e8a358
--- /dev/null
+++ b/test/replication/gh-6035-node.lua
@@ -0,0 +1,34 @@
+local INSTANCE_ID = string.match(arg[0], "gh%-6035%-(.+)%.lua")
+
+local function unix_socket(name)
+ return "unix/:./" .. name .. '.sock';
+end
+
+require('console').listen(os.getenv('ADMIN'))
+
+if INSTANCE_ID == "master" then
+ box.cfg({
+ listen = unix_socket("master"),
+ })
+elseif INSTANCE_ID == "replica1" then
+ box.cfg({
+ listen = unix_socket("replica1"),
+ replication = {
+ unix_socket("master"),
+ unix_socket("replica1")
+ },
+ election_mode = 'voter'
+ })
+else
+ assert(INSTANCE_ID == "replica2")
+ box.cfg({
+ replication = {
+ unix_socket("master"),
+ },
+ election_mode = 'voter'
+ })
+end
+
+box.once("bootstrap", function()
+ box.schema.user.grant('guest', 'super')
+end)
diff --git a/test/replication/gh-6035-replica1.lua b/test/replication/gh-6035-replica1.lua
new file mode 120000
index 0000000000000000000000000000000000000000..f7ede7ef2036136936cba51ab0baf874bc80d59f
--- /dev/null
+++ b/test/replication/gh-6035-replica1.lua
@@ -0,0 +1 @@
+gh-6035-node.lua
\ No newline at end of file
diff --git a/test/replication/gh-6035-replica2.lua b/test/replication/gh-6035-replica2.lua
new file mode 120000
index 0000000000000000000000000000000000000000..f7ede7ef2036136936cba51ab0baf874bc80d59f
--- /dev/null
+++ b/test/replication/gh-6035-replica2.lua
@@ -0,0 +1 @@
+gh-6035-node.lua
\ No newline at end of file
diff --git a/test/replication/suite.cfg b/test/replication/suite.cfg
index 3a0a8649ffe0fb02ab87a6e8dfa6f028f06e9c14..69f2f3511d1e3faa6d3944b88344c170877a17aa 100644
--- a/test/replication/suite.cfg
+++ b/test/replication/suite.cfg
@@ -50,6 +50,7 @@
"gh-6057-qsync-confirm-async-no-wal.test.lua": {},
"gh-6094-rs-uuid-mismatch.test.lua": {},
"gh-6127-election-join-new.test.lua": {},
+ "gh-6035-applier-filter.test.lua": {},
"*": {
"memtx": {"engine": "memtx"},
"vinyl": {"engine": "vinyl"}