From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 6899123679 for ; Sat, 7 Sep 2019 09:25:00 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wd2gquP_dpN9 for ; Sat, 7 Sep 2019 09:25:00 -0400 (EDT) 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 turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 293DF23471 for ; Sat, 7 Sep 2019 09:25:00 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH 1/1] box: raise an error on nil replicaset and instance uuid From: Vladislav Shpilevoy References: Message-ID: Date: Sat, 7 Sep 2019 15:28:35 +0200 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: tarantool-patches@freelists.org Cc: alexander.turenko@tarantool.org On 07/09/2019 15:26, Vladislav Shpilevoy wrote: > Before the patch the nil UUID was ignored and a new random one > was generated. This was because internally box treats nil UUID > as its absense. 'absense' -> 'absence'. > > Now a user will see an explicit message that nil UUID is a > reserved value. > > Closes #4282 > --- > Branch: https://github.com/tarantool/tarantool/tree/gerold103/gh-4282-box-cfg-rs-uuid > Issue: https://github.com/tarantool/tarantool/issues/4282 > > src/box/box.cc | 25 +++++++++++++++++-------- > test/app-tap/cfg.test.lua | 12 +++++++++++- > 2 files changed, 28 insertions(+), 9 deletions(-) > > diff --git a/src/box/box.cc b/src/box/box.cc > index ac10c21ad..5efc88d5f 100644 > --- a/src/box/box.cc > +++ b/src/box/box.cc > @@ -480,22 +480,31 @@ box_check_replication_sync_timeout(void) > return timeout; > } > > +static inline void > +box_check_uuid(struct tt_uuid *uuid, const char* name) Sorry, '*' should be right before 'name'. (Messed with Ubisoft code style)