From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <sergepetrenko@tarantool.org> Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 7942446971A for <tarantool-patches@dev.tarantool.org>; Sun, 15 Dec 2019 23:58:58 +0300 (MSK) From: sergepetrenko <sergepetrenko@tarantool.org> Date: Sun, 15 Dec 2019 23:58:42 +0300 Message-Id: <7afe7a02a42fa138fef987ffdf5ef3f79b8ebb76.1576443171.git.sergepetrenko@tarantool.org> In-Reply-To: <cover.1576443171.git.sergepetrenko@tarantool.org> References: <cover.1576443171.git.sergepetrenko@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 2/5] replication: do not decode replicaset uuid when processing a subscribe List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org> List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe> List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/> List-Post: <mailto:tarantool-patches@dev.tarantool.org> List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help> List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe> To: georgy@tarantool.org Cc: tarantool-patches@dev.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 76fe0d534..981a5bac1 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)