From: sergepetrenko <sergepetrenko@tarantool.org>
To: v.shpilevoy@tarantool.org, georgy@tarantool.org
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v2 2/5] replication: do not decode replicaset uuid when processing a subscribe
Date: Wed, 25 Dec 2019 15:46:59 +0300 [thread overview]
Message-ID: <485927b484c51b92397af90e8ed5013e32d8debd.1577277455.git.sergepetrenko@tarantool.org> (raw)
In-Reply-To: <cover.1577277455.git.sergepetrenko@tarantool.org>
From: Serge Petrenko <sergepetrenko@tarantool.org>
After moving cluster id check to replica (7f8cbde3555084ad6c41f137aec4faba4648c705)
we do not check it on master side, so no need to decode it.
Prerequisite #3186
---
src/box/box.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/box/box.cc b/src/box/box.cc
index 22ac8bda1..56d07e634 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -1533,11 +1533,11 @@ box_process_subscribe(struct ev_io *io, struct xrow_header *header)
if (!is_box_configured)
tnt_raise(ClientError, ER_LOADING);
- struct tt_uuid replicaset_uuid = uuid_nil, replica_uuid = uuid_nil;
+ struct tt_uuid replica_uuid = uuid_nil;
struct vclock replica_clock;
uint32_t replica_version_id;
vclock_create(&replica_clock);
- xrow_decode_subscribe_xc(header, &replicaset_uuid, &replica_uuid,
+ xrow_decode_subscribe_xc(header, NULL, &replica_uuid,
&replica_clock, &replica_version_id);
/* Forbid connection to itself */
--
2.20.1 (Apple Git-117)
next prev parent reply other threads:[~2019-12-25 12:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-25 12:46 [Tarantool-patches] [PATCH v2 0/5] introduce anonymous replicas sergepetrenko
2019-12-25 12:46 ` [Tarantool-patches] [PATCH v2 1/5] box: update comment describing join protocol sergepetrenko
2019-12-25 12:46 ` sergepetrenko [this message]
2019-12-25 12:47 ` [Tarantool-patches] [PATCH v2 3/5] applier: split join processing into two stages sergepetrenko
2019-12-25 12:47 ` [Tarantool-patches] [PATCH v2 4/5] vclock: ignore 0th component in comparisons sergepetrenko
2019-12-25 16:00 ` Vladislav Shpilevoy
2019-12-27 18:42 ` Vladislav Shpilevoy
2019-12-28 11:21 ` Sergey Petrenko
2019-12-25 12:47 ` [Tarantool-patches] [PATCH v2 5/5] replication: introduce anonymous replica sergepetrenko
2019-12-25 18:22 ` Vladislav Shpilevoy
2019-12-27 15:27 ` Sergey Petrenko
2019-12-27 18:42 ` Vladislav Shpilevoy
2019-12-28 11:48 ` Sergey Petrenko
2019-12-28 12:15 ` Vladislav Shpilevoy
2019-12-30 5:12 ` [Tarantool-patches] [PATCH v2 0/5] introduce anonymous replicas Kirill Yukhin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=485927b484c51b92397af90e8ed5013e32d8debd.1577277455.git.sergepetrenko@tarantool.org \
--to=sergepetrenko@tarantool.org \
--cc=georgy@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--cc=v.shpilevoy@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v2 2/5] replication: do not decode replicaset uuid when processing a subscribe' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox