[Tarantool-patches] [PATCH v3 05/10] box: write PROMOTE even for empty limbo

[Serge Petrenko]

16.04.2021 02:21, Vladislav Shpilevoy пишет:
> Thanks for the patch!
>
>> @@ -1540,11 +1542,10 @@ box_clear_synchro_queue(bool try_wait)
>>   	 * in the limbo must've come through the applier meaning they already
>>   	 * have an lsn assigned, even if their WAL write hasn't finished yet.
>>   	 */
>> -	int64_t wait_lsn = txn_limbo_last_synchro_entry(&txn_limbo)->lsn;
>> +	wait_lsn = txn_limbo_last_synchro_entry(&txn_limbo)->lsn;
>>   	assert(wait_lsn > 0);
>>   
>> -	int quorum = replication_synchro_quorum;
>> -	int rc = box_wait_quorum(former_leader_id, wait_lsn, quorum,
>> +	rc = box_wait_quorum(former_leader_id, wait_lsn, quorum,
>>   				 replication_synchro_timeout);
> The second line became misaligned.

Thanks for noticing!
Fixed.

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

diff --git a/src/box/box.cc b/src/box/box.cc
index 123c611f5..be78d7096 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -1546,7 +1546,7 @@ box_clear_synchro_queue(bool try_wait)
         assert(wait_lsn > 0);

         rc = box_wait_quorum(former_leader_id, wait_lsn, quorum,
-                                replication_synchro_timeout);
+                            replication_synchro_timeout);
         if (rc == 0) {
                 if (quorum < replication_synchro_quorum) {
                         diag_set(ClientError, ER_QUORUM_WAIT, quorum,

-- 
Serge Petrenko