From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id E9EDC6EC63; Thu, 22 Apr 2021 14:34:53 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E9EDC6EC63 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1619091294; bh=OByboYbjyj/WxZWpcslHEJjAUbmH3i4oA6uWQkxZkz0=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=WN/AKVa2iigDWFayI/OFf1UBPZViaBy75dXoO1RBSJm1mQkOjDIc5qekaQzw1QaMM oBMWv6Z6nBKYxIjWw7twfUqQZKqtaq4SF+Op038cLmm+xvhqYa+KmkT237cHnt7GtJ KHWds0/57UQaOac8mzpUnIYef66tnTfipi1IpKW0= Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 473596EC63 for ; Thu, 22 Apr 2021 14:34:52 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 473596EC63 Received: by mail-lj1-f179.google.com with SMTP id l22so44061660ljc.9 for ; Thu, 22 Apr 2021 04:34:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Gnecyx1TwSZ/2HYFjqUAVNCkHsBZudPHfeh7rlB0SVE=; b=cYOlJTau/y1l9aKCzKo2UQCSx6xjBpNt14STVTdXxiWfLzbpn523WlI4c0x/aqwZMP YuTW+re/PSBR8Es3kQ4Q5LgrzXVEAEC1ZAC95jMUgmjZ3OJzVM2gpJRTsDxQaHcC0YgU 5SmhEcYah0EVOjzWNVavwWnE3CnrF294nmN6k23Bny0DD9n8qBFAbmp4UkrKQ7fAOYkH RXA241gGiY6hbMN2zZAqSdOAjDneBwuHhBRNhcAXcxJYd9vkXyc4Z+JFjigwhhceJfSW 0I9n9HFUxKLQ1nrCAzWOW8Srb7n7t54cttoFHygJ0BXg6G2cwg2BlG2pr/uZAJruIgZJ A1Bg== X-Gm-Message-State: AOAM532zsGDJI+/wWn6VJ9F3BSX1W/j3gWWKzDv8Pa0nLkhml0XvIqM4 1Y4jp/RCW32535iUfeaqfH0GKkEa9mc= X-Google-Smtp-Source: ABdhPJxB3KN4FOh1IhFP5CDtmhZy9d4pb6NT3TlqLGpONeMg+AriQGekAGdmg7VQh5djJo4o4EE1Lw== X-Received: by 2002:a2e:5347:: with SMTP id t7mr2126930ljd.263.1619091291038; Thu, 22 Apr 2021 04:34:51 -0700 (PDT) Received: from grain.localdomain ([5.18.199.94]) by smtp.gmail.com with ESMTPSA id b21sm252931ljf.32.2021.04.22.04.34.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Apr 2021 04:34:50 -0700 (PDT) Received: by grain.localdomain (Postfix, from userid 1000) id 71CEA5601D2; Thu, 22 Apr 2021 14:34:49 +0300 (MSK) To: tml Date: Thu, 22 Apr 2021 14:34:45 +0300 Message-Id: <20210422113445.270688-1-gorcunov@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210419083719.29689-1-gorcunov@gmail.com> References: <20210419083719.29689-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 4/4] txn_limbo: simplify txn_limbo_on_parameters_change X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Cyrill Gorcunov via Tarantool-patches Reply-To: Cyrill Gorcunov Cc: Vladislav Shpilevoy Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" There is no need to test @confirm_lsn since we're continue the list traversing in any case. I keep "continue" here to be consistent with other "if"s. Signed-off-by: Cyrill Gorcunov --- src/box/txn_limbo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/box/txn_limbo.c b/src/box/txn_limbo.c index 0ac8fff25..c07db3025 100644 --- a/src/box/txn_limbo.c +++ b/src/box/txn_limbo.c @@ -707,8 +707,7 @@ txn_limbo_on_parameters_change(struct txn_limbo *limbo) assert(e->ack_count <= VCLOCK_MAX); if (!txn_has_flag(e->txn, TXN_WAIT_ACK)) { assert(e->lsn == -1); - if (confirm_lsn == -1) - continue; + continue; } else if (e->ack_count < replication_synchro_quorum) { continue; } else { -- 2.30.2