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 439A86EC40; Fri, 2 Jul 2021 01:11:41 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 439A86EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1625177501; bh=GGZXA9+eVNClWRUmsa9+jJLhHOn3NQPgadak5Wnb4tM=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=IHcr9lTogrGosIM3K2dcyIAnsigrtSAWlZItJQ3XRTlX/KRYCQlS31pEqBKt0O17g ePKdjGaqQ6Wxh3H2m46GnZJXnR8KsICdWXYyv/WWP88CCFhV4bM3SrrlMlWTuz1xTe YMFQ+UxHm5NA6L+KWEQkg+IXIZUzBbNbuTPREA+E= Received: from smtpng3.i.mail.ru (smtpng3.i.mail.ru [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 B3F2A6EC5B for ; Fri, 2 Jul 2021 01:09:41 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B3F2A6EC5B Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1lz4sO-00061t-So; Fri, 02 Jul 2021 01:09:41 +0300 To: tarantool-patches@dev.tarantool.org, olegrok@tarantool.org, yaroslav.dynnikov@tarantool.org Date: Fri, 2 Jul 2021 00:09:34 +0200 Message-Id: <888cee3d83fff78411e0cf96ee6b2e8292887677.1625177221.git.v.shpilevoy@tarantool.org> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD954DFF1DC42D673FB2F1AA0EB8A504C8721532AB396CDCF09182A05F5380850407E938006178308A4BA7751BF2227C2E6A88E4498AEB3658E284E335FAEBC5FFE X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE702C8878A98595F58EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063718A0EC59585977138638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D864608427432D474D9B8DB1E07B950CFC117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC974A882099E279BDA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18CB629EEF1311BF91D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6A1DCCEB63E2F10FB089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C97831B2FCC5B1B5B115E59BFD3320250DC888 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C4C7A0BC55FA0FE5FC552C9033C69F361997225371D95C750AAF8BF2D27E892D44B1881A6453793CE9C32612AADDFBE061C61BE10805914D3804EBA3D8E7E5B87ABF8C51168CD8EBDB3D2201D7125A9A9FDC48ACC2A39D04F89CDFB48F4795C241BDAD6C7F3747799A X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34A246DFF68F0EE19E7D3A1D58DBA6EA8AFCA50913E912DE2DC80079A9876AFEEEFF4E76B0665AE8EF1D7E09C32AA3244CE6C25F191C34C26EBB8D3643BF46C7F5C3B3ADDA61883BB5FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbL9S8ysBdXjw2yJDrod5MB1sYgugB6Dg X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822D68DDD1B1951C02C3106007D7ACF4E633841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH vshard 4/6] config: introduce master 'auto' replicaset option 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: Vladislav Shpilevoy via Tarantool-patches Reply-To: Vladislav Shpilevoy Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" The new option will enable auto-search for master on the marked replicasets. Part of #75 --- test/unit/config.result | 48 +++++++++++++++++++++++++++++++++++++++ test/unit/config.test.lua | 21 +++++++++++++++++ vshard/cfg.lua | 27 +++++++++++++++++++--- 3 files changed, 93 insertions(+), 3 deletions(-) diff --git a/test/unit/config.result b/test/unit/config.result index 9df3bf1..676ee4d 100644 --- a/test/unit/config.result +++ b/test/unit/config.result @@ -656,3 +656,51 @@ util.check_error(lcfg.check, cfg) cfg.sched_move_quota = nil --- ... +-- +-- gh-75: auto master discovery. +-- +replicaset = {replicas = {uuid = replica}} +--- +... +replicaset.master = 'auto' +--- +... +cfg.sharding = {rsid = replicaset} +--- +... +_ = lcfg.check(cfg) +--- +... +replicaset.master = 'non-auto' +--- +... +util.check_error(lcfg.check, cfg) +--- +- Only "auto" master is supported +... +replicaset.master = 123 +--- +... +util.check_error(lcfg.check, cfg) +--- +- Master search mode must be string +... +replica.master = true +--- +... +replicaset.master = 'auto' +--- +... +util.check_error(lcfg.check, cfg) +--- +- Can not specify master nodes when master search is enabled, but found master flag + in replica uuid uuid +... +replica.master = false +--- +... +util.check_error(lcfg.check, cfg) +--- +- Can not specify master nodes when master search is enabled, but found master flag + in replica uuid uuid +... diff --git a/test/unit/config.test.lua b/test/unit/config.test.lua index 473e460..4dfbd77 100644 --- a/test/unit/config.test.lua +++ b/test/unit/config.test.lua @@ -264,3 +264,24 @@ _ = lcfg.check(cfg) cfg.sched_move_quota = -1 util.check_error(lcfg.check, cfg) cfg.sched_move_quota = nil + +-- +-- gh-75: auto master discovery. +-- +replicaset = {replicas = {uuid = replica}} +replicaset.master = 'auto' +cfg.sharding = {rsid = replicaset} +_ = lcfg.check(cfg) + +replicaset.master = 'non-auto' +util.check_error(lcfg.check, cfg) + +replicaset.master = 123 +util.check_error(lcfg.check, cfg) + +replica.master = true +replicaset.master = 'auto' +util.check_error(lcfg.check, cfg) + +replica.master = false +util.check_error(lcfg.check, cfg) diff --git a/vshard/cfg.lua b/vshard/cfg.lua index 30f8794..401d969 100644 --- a/vshard/cfg.lua +++ b/vshard/cfg.lua @@ -2,6 +2,7 @@ local log = require('log') local luri = require('uri') +local lutil = require('vshard.util') local consts = require('vshard.consts') local function check_uri(uri) @@ -10,7 +11,7 @@ local function check_uri(uri) end end -local function check_master(master, ctx) +local function check_replica_master(master, ctx) if master then if ctx.master then error('Only one master is allowed per replicaset') @@ -20,6 +21,15 @@ local function check_master(master, ctx) end end +local function check_replicaset_master(master, ctx) + if not lutil.version_is_at_least(1, 10, 0) then + error('Only versions >= 1.10 support master discovery') + end + if master ~= 'auto' then + error('Only "auto" master is supported') + end +end + local function is_number(v) return type(v) == 'number' and v == v end @@ -111,8 +121,8 @@ local replica_template = { name = {type = 'string', name = "Name", is_optional = true}, zone = {type = {'string', 'number'}, name = "Zone", is_optional = true}, master = { - type = 'boolean', name = "Master", is_optional = true, default = false, - check = check_master + type = 'boolean', name = "Master", is_optional = true, + check = check_replica_master }, } @@ -130,6 +140,10 @@ local replicaset_template = { default = 1, }, lock = {type = 'boolean', name = 'Lock', is_optional = true}, + master = { + type = 'string', name = 'Master search mode', is_optional = true, + check = check_replicaset_master + }, } -- @@ -185,6 +199,7 @@ local function check_sharding(sharding) error('Replicaset weight can not be Inf') end validate_config(replicaset, replicaset_template) + local is_auto_master = replicaset.master == 'auto' for replica_uuid, replica in pairs(replicaset.replicas) do if uris[replica.uri] then error(string.format('Duplicate uri %s', replica.uri)) @@ -194,6 +209,12 @@ local function check_sharding(sharding) error(string.format('Duplicate uuid %s', replica_uuid)) end uuids[replica_uuid] = true + if is_auto_master and replica.master ~= nil then + error(string.format('Can not specify master nodes when '.. + 'master search is enabled, but found '.. + 'master flag in replica uuid %s', + replica_uuid)) + end -- Log warning in case replica.name duplicate is -- found. Message appears once for each unique -- duplicate. -- 2.24.3 (Apple Git-128)