From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f193.google.com (mail-lj1-f193.google.com [209.85.208.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 83289445320 for ; Tue, 14 Jul 2020 17:45:31 +0300 (MSK) Received: by mail-lj1-f193.google.com with SMTP id h22so23059783lji.9 for ; Tue, 14 Jul 2020 07:45:31 -0700 (PDT) From: Cyrill Gorcunov Date: Tue, 14 Jul 2020 17:44:40 +0300 Message-Id: <20200714144440.551127-5-gorcunov@gmail.com> In-Reply-To: <20200714144440.551127-1-gorcunov@gmail.com> References: <20200714144440.551127-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 4/4] qsync: don't send negative timeouts into fiber_cond_wait_timeout List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladislav Shpilevoy Cc: tml Basically our timeout is calculated via (a - b), where @a is a constant positive value fetched once, in turn the @b is rather a dynamic value thus the result may be negative. libev uses assert() call to catch such values when passed to timers setup. Thus lets intercept potential assert() trigger and exit early if timeout is already expired. Signed-off-by: Cyrill Gorcunov --- src/box/txn_limbo.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/box/txn_limbo.c b/src/box/txn_limbo.c index d5b887d36..3ed0b6db5 100644 --- a/src/box/txn_limbo.c +++ b/src/box/txn_limbo.c @@ -176,6 +176,8 @@ 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(); + if (timeout < 0) + goto do_rollback; int rc = fiber_cond_wait_timeout(&limbo->wait_cond, timeout); fiber_set_cancellable(cancellable); if (txn_limbo_entry_is_complete(entry)) @@ -511,6 +513,8 @@ txn_limbo_wait_confirm(struct txn_limbo *limbo) double deadline = start_time + replication_synchro_timeout; bool cancellable = fiber_set_cancellable(false); double timeout = deadline - fiber_clock(); + if (timeout < 0) + goto timed_out; int rc = fiber_cond_wait_timeout(&limbo->wait_cond, timeout); fiber_set_cancellable(cancellable); if (cwp.is_confirm || cwp.is_rollback) -- 2.26.2