[Tarantool-patches] [PATCH 3/4] qsync: txn_limbo_wait_complete -- fix type conversion

Cyrill Gorcunov gorcunov at gmail.com
Tue Jul 14 17:44:39 MSK 2020


In txn_limbo_wait_confirm we already use proper int type
(as declared in fiber_cond_wait_timeout) thus lets do the
same here.

Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
---
 src/box/txn_limbo.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/box/txn_limbo.c b/src/box/txn_limbo.c
index 15dbe6515..d5b887d36 100644
--- a/src/box/txn_limbo.c
+++ b/src/box/txn_limbo.c
@@ -176,12 +176,11 @@ txn_limbo_wait_complete(struct txn_limbo *limbo, struct txn_limbo_entry *entry)
 		double deadline = start_time + replication_synchro_timeout;
 		bool cancellable = fiber_set_cancellable(false);
 		double timeout = deadline - fiber_clock();
-		bool timed_out = fiber_cond_wait_timeout(&limbo->wait_cond,
-							 timeout);
+		int rc = fiber_cond_wait_timeout(&limbo->wait_cond, timeout);
 		fiber_set_cancellable(cancellable);
 		if (txn_limbo_entry_is_complete(entry))
 			goto complete;
-		if (timed_out)
+		if (rc != 0)
 			goto do_rollback;
 	}
 
-- 
2.26.2



More information about the Tarantool-patches mailing list