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 8D1936EC56; Thu, 15 Jul 2021 00:25:15 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 8D1936EC56 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1626297915; bh=mp0AsmbcB8Wx/iSbi/2+H0YDOUfuITq2ZVNZTdNMkYI=; 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=frERX6YNwUv71Dr1zZ9uQJ9QMu01KHB7XkSDVN6bzbErbZSlVB5Ja46Sfa8/N0oTh jEf67zmYDMvz0DI49tXqOWfEXzRhMDjAMxbj61FzCahIPxd+XT+68+X3pjayPQqc6Z Mwv7QbAhdWPWMzOP7XNZCsJaHyMwCR9UNiVxm9VA= Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (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 856E26EC5A for ; Thu, 15 Jul 2021 00:24:12 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 856E26EC5A Received: by mail-lj1-f175.google.com with SMTP id b40so5477191ljf.12 for ; Wed, 14 Jul 2021 14:24:12 -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=bt3efUbeJtuajtk22IwH/O9ZJ7YPqamn6aiKlvHWAYk=; b=fB4DER4Kd2iXqcUX7FLB9A9zWZQ4nJpA1yJNcGtkX3LOgmUEZQkVdZfN8lf+L3ghk7 i0aADcXJ+dBKqzwwubDVYQ4oDIIM8Tr3vKH394Zl9yeQP7EobufFyakxQDA4xpmI29/B AmkyIbyj2FXUr8aVYwUHpqRQWnSHV1RA6T9QVhZenjUcQJTbXdwFCQdygN/tUigcRLtI Z1GHfCpByqIJD8k1E8FlihBpUziWpRvQ53jc70EsamUgAFjwEf0u6HIIUtb4m/hlVann byyelQiUnUIj5KyjT2x4ipzNeszrCdnO30udgARpJwBZlG3OoB36snaTGz4ve4GdchR+ 7YWw== X-Gm-Message-State: AOAM532otw2iKUlJGKO6CrTlrlA+tSRW7pB9nbqdOz06pj2B3SQmiWCO x0UHUu25+A5mAuQ9vT+ELczx2aFrDlLv/Q== X-Google-Smtp-Source: ABdhPJwVTevqA5iWBHFYguW7elgfRkuWnox+jT7MPIgcyS3oTzA+1SJBByQfsem8en/Mbydkx3IVpw== X-Received: by 2002:a2e:7e09:: with SMTP id z9mr2432ljc.340.1626297851269; Wed, 14 Jul 2021 14:24:11 -0700 (PDT) Received: from grain.localdomain ([5.18.199.94]) by smtp.gmail.com with ESMTPSA id f13sm251662lfm.307.2021.07.14.14.24.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 14:24:10 -0700 (PDT) Received: by grain.localdomain (Postfix, from userid 1000) id 8F2705A0021; Thu, 15 Jul 2021 00:23:32 +0300 (MSK) To: tml Date: Thu, 15 Jul 2021 00:23:26 +0300 Message-Id: <20210714212328.701280-4-gorcunov@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210714212328.701280-1-gorcunov@gmail.com> References: <20210714212328.701280-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [RFC v5 3/5] limbo: gather promote tracking into a separate structure 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" It is needed to introduce ordered promote related data modifications in next patch. Part-of #6036 Signed-off-by: Cyrill Gorcunov --- src/box/txn_limbo.c | 24 ++++++++++++++-------- src/box/txn_limbo.h | 49 ++++++++++++++++++++++++++++----------------- 2 files changed, 47 insertions(+), 26 deletions(-) diff --git a/src/box/txn_limbo.c b/src/box/txn_limbo.c index 570f77c46..957fe0d1e 100644 --- a/src/box/txn_limbo.c +++ b/src/box/txn_limbo.c @@ -37,6 +37,13 @@ struct txn_limbo txn_limbo; +static void +txn_limbo_promote_create(struct txn_limbo_promote *pmt) +{ + vclock_create(&pmt->terms_map); + pmt->terms_max = 0; +} + static inline void txn_limbo_create(struct txn_limbo *limbo) { @@ -45,8 +52,7 @@ txn_limbo_create(struct txn_limbo *limbo) limbo->owner_id = REPLICA_ID_NIL; fiber_cond_create(&limbo->wait_cond); vclock_create(&limbo->vclock); - vclock_create(&limbo->promote_term_map); - limbo->promote_greatest_term = 0; + txn_limbo_promote_create(&limbo->promote); limbo->confirmed_lsn = 0; limbo->rollback_count = 0; limbo->is_in_rollback = false; @@ -305,10 +311,11 @@ void txn_limbo_checkpoint(const struct txn_limbo *limbo, struct synchro_request *req) { + const struct txn_limbo_promote *pmt = &limbo->promote; req->type = IPROTO_PROMOTE; req->replica_id = limbo->owner_id; req->lsn = limbo->confirmed_lsn; - req->term = limbo->promote_greatest_term; + req->term = pmt->terms_max; } static void @@ -726,20 +733,21 @@ txn_limbo_wait_empty(struct txn_limbo *limbo, double timeout) void txn_limbo_process(struct txn_limbo *limbo, const struct synchro_request *req) { + struct txn_limbo_promote *pmt = &limbo->promote; uint64_t term = req->term; uint32_t origin = req->origin_id; if (txn_limbo_replica_term(limbo, origin) < term) { - vclock_follow(&limbo->promote_term_map, origin, term); - if (term > limbo->promote_greatest_term) - limbo->promote_greatest_term = term; + vclock_follow(&pmt->terms_map, origin, term); + if (term > pmt->terms_max) + pmt->terms_max = term; } else if (iproto_type_is_promote_request(req->type) && - limbo->promote_greatest_term > 1) { + pmt->terms_max > 1) { /* PROMOTE for outdated term. Ignore. */ say_info("RAFT: ignoring %s request from instance " "id %u for term %llu. Greatest term seen " "before (%llu) is bigger.", iproto_type_name(req->type), origin, (long long)term, - (long long)limbo->promote_greatest_term); + (long long)pmt->terms_max); return; } diff --git a/src/box/txn_limbo.h b/src/box/txn_limbo.h index 53e52f676..70a5fbfd5 100644 --- a/src/box/txn_limbo.h +++ b/src/box/txn_limbo.h @@ -75,6 +75,31 @@ txn_limbo_entry_is_complete(const struct txn_limbo_entry *e) return e->is_commit || e->is_rollback; } +/** + * Keep state of promote requests to handle split-brain + * situation and other errors. + */ +struct txn_limbo_promote { + /** + * Latest terms received with PROMOTE entries from remote instances. + * Limbo uses them to filter out the transactions coming not from the + * limbo owner, but so outdated that they are rolled back everywhere + * except outdated nodes. + */ + struct vclock terms_map; + /** + * The biggest PROMOTE term seen by the instance and persisted in WAL. + * It is related to raft term, but not the same. Synchronous replication + * represented by the limbo is interested only in the won elections + * ended with PROMOTE request. + * It means the limbo's term might be smaller than the raft term, while + * there are ongoing elections, or the leader is already known and this + * instance hasn't read its PROMOTE request yet. During other times the + * limbo and raft are in sync and the terms are the same. + */ + uint64_t terms_max; +}; + /** * Limbo is a place where transactions are stored, which are * finished, but not committed nor rolled back. These are @@ -130,23 +155,9 @@ struct txn_limbo { */ struct vclock vclock; /** - * Latest terms received with PROMOTE entries from remote instances. - * Limbo uses them to filter out the transactions coming not from the - * limbo owner, but so outdated that they are rolled back everywhere - * except outdated nodes. - */ - struct vclock promote_term_map; - /** - * The biggest PROMOTE term seen by the instance and persisted in WAL. - * It is related to raft term, but not the same. Synchronous replication - * represented by the limbo is interested only in the won elections - * ended with PROMOTE request. - * It means the limbo's term might be smaller than the raft term, while - * there are ongoing elections, or the leader is already known and this - * instance hasn't read its PROMOTE request yet. During other times the - * limbo and raft are in sync and the terms are the same. + * Track promote requests. */ - uint64_t promote_greatest_term; + struct txn_limbo_promote promote; /** * Maximal LSN gathered quorum and either already confirmed in WAL, or * whose confirmation is in progress right now. Any attempt to confirm @@ -218,7 +229,8 @@ txn_limbo_last_entry(struct txn_limbo *limbo) static inline uint64_t txn_limbo_replica_term(const struct txn_limbo *limbo, uint32_t replica_id) { - return vclock_get(&limbo->promote_term_map, replica_id); + const struct txn_limbo_promote *pmt = &limbo->promote; + return vclock_get(&pmt->terms_map, replica_id); } /** @@ -229,8 +241,9 @@ static inline bool txn_limbo_is_replica_outdated(const struct txn_limbo *limbo, uint32_t replica_id) { + const struct txn_limbo_promote *pmt = &limbo->promote; return txn_limbo_replica_term(limbo, replica_id) < - limbo->promote_greatest_term; + pmt->terms_max; } /** -- 2.31.1