[Tarantool-patches] [PATCH v4 07/12] raft: filter rows based on known peer terms

[Serge Petrenko]

18.04.2021 18:44, Vladislav Shpilevoy пишет:
> I accidentally updated curl submodule (forgot to update the
> submodules before doing my amendments), we need to revert it back.

Yep. Fixed.

>
>> diff --git a/src/box/applier.cc b/src/box/applier.cc
>> index 61d53fdec..b0e8fbba7 100644
>> --- a/src/box/applier.cc
>> +++ b/src/box/applier.cc
>> @@ -967,6 +967,59 @@ apply_final_join_tx(struct stailq *rows)
>>   	return rc;
>>   }
>>   
>> +/*
> Also I forgot to make it /** instead of /*.

Thanks! Fixed as well.
Incremental diff's below.

>
>> + * When elections are enabled we must filter out synchronous rows coming
>> + * from an instance that fell behind the current leader. This includes
>> + * both synchronous tx rows and rows for txs following unconfirmed
>> + * synchronous transactions.
>> + * The rows are replaced with NOPs to preserve the vclock consistency.
>> + */

I've also fixed the issue we discussed verbally, about filtering by
row->replica_id rather than by applier->instance_id.
This is important because once new leader is elected, it may be
outdated until it sends us its promote request. But there may be
valid rows from the previous leader that we need to accept.
Old leader is not outdated until we receive the new leader's promote,
so we have to apply its rows.

================================================

diff --git a/src/box/applier.cc b/src/box/applier.cc
index b0e8fbba7..dc05c91d3 100644
--- a/src/box/applier.cc
+++ b/src/box/applier.cc
@@ -967,7 +967,7 @@ apply_final_join_tx(struct stailq *rows)
         return rc;
  }

-/*
+/**
   * When elections are enabled we must filter out synchronous rows coming
   * from an instance that fell behind the current leader. This includes
   * both synchronous tx rows and rows for txs following unconfirmed
@@ -975,7 +975,7 @@ apply_final_join_tx(struct stailq *rows)
   * The rows are replaced with NOPs to preserve the vclock consistency.
   */
  static void
-applier_synchro_filter_tx(struct applier *applier, struct stailq *rows)
+applier_synchro_filter_tx(struct stailq *rows)
  {
         /*
          * XXX: in case raft is disabled, synchronous replication still 
works
@@ -985,15 +985,18 @@ applier_synchro_filter_tx(struct applier *applier, 
struct stailq *rows)
          */
         if (!raft_is_enabled(box_raft()))
                 return;
-       if (!txn_limbo_is_replica_outdated(&txn_limbo, 
applier->instance_id))
+       struct xrow_header *row;
+       /*
+        * It  may happen that we receive the instance's rows via some third
+        * node, so cannot check for applier->instance_id here.
+        */
+       row = &stailq_first_entry(rows, struct applier_tx_row, next)->row;
+       if (!txn_limbo_is_replica_outdated(&txn_limbo, row->replica_id))
                 return;

-       struct xrow_header *row;
-       row = &stailq_last_entry(rows, struct applier_tx_row, next)->row;
-       if (row->wait_sync)
+       if (stailq_last_entry(rows, struct applier_tx_row, 
next)->row.wait_sync)
                 goto nopify;

-       row = &stailq_first_entry(rows, struct applier_tx_row, next)->row;
         /*
          * Not waiting for sync and not a synchro request - this make 
it already
          * NOP or an asynchronous transaction not depending on any 
synchronous
@@ -1079,7 +1082,7 @@ applier_apply_tx(struct applier *applier, struct 
stailq *rows)
                         }
                 }
         }
-       applier_synchro_filter_tx(applier, rows);
+       applier_synchro_filter_tx(rows);
         if (unlikely(iproto_type_is_synchro_request(first_row->type))) {
                 /*
                  * Synchro messages are not transactions, in terms
diff --git a/third_party/curl b/third_party/curl
index 12af024bc..3266b35bb 160000
--- a/third_party/curl
+++ b/third_party/curl
@@ -1 +1 @@
-Subproject commit 12af024bc85606b14ffc415413a7e86e6bbee7eb
+Subproject commit 3266b35bbe21c68dea0dc7ccd991eb028e6d360c

-- 
Serge Petrenko