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 948016ECC0; Sat, 18 Dec 2021 02:10:22 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 948016ECC0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1639782622; bh=/gsfLWcZ4vctZUFLUH0hltFAXNqt0iv86OpLKFw+nbE=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=E6nH1+GZ5QnSMLvwHtbSTZ9V/WXR8k/WkC72bYF+bHG8Fa+sxbyQaEq/9OeZFNMA5 geOhzWwXTUmh3Wa311pMEAyrjEmYjmLS4to00H2YYVI8YD+562RfZg+lTJRubLCjfq y5Y8LdTZYfjtOTejkInc0J116SOreCONqEiWCrf8= Received: from smtp39.i.mail.ru (smtp39.i.mail.ru [94.100.177.99]) (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 638A46ECC0 for ; Sat, 18 Dec 2021 02:10:20 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 638A46ECC0 Received: by smtp39.i.mail.ru with esmtpa (envelope-from ) id 1myMMl-0006vp-MM; Sat, 18 Dec 2021 02:10:20 +0300 Message-ID: Date: Sat, 18 Dec 2021 00:10:18 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Content-Language: en-US To: Oleg Babin , tarantool-patches@dev.tarantool.org References: <9e5ff9cae03a55bf3cacc482449f19895360c80d.1639700518.git.v.shpilevoy@tarantool.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9B5397E24C93BDA67CDE94F05641003F359FF77D30AD3E306182A05F5380850403BBFA7E7C4E81975E21280B71695D5565DFD2A65068F569E65AE1580BD0E5786 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE721D130CF676D2164EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637B84F9009663064BD8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8ADE6C61CF991AB9DE2B5B9D15B3DE5E4117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD182CC0D3CB04F14752D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE437C869540D2AB0F287C8E22D4AE2A51D8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE3724336BCC0EE1BA8AD7EC71F1DB88427C4224003CC836476EA7A3FFF5B025636E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637AF8E4F18C523FAA9EFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: 0D63561A33F958A5AF80330F8835F3CDF2FE7DC8FF38D9AAD92FFD42EA589D24D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA759D2A03B9C34326B3410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3454E98140CCACB5B3D63F24E93F16BCE05E7A1FC3189E9A76350D86A57C397C89907808E86D22A83A1D7E09C32AA3244CF9D15B01AD572E9C51B5D1DEF4F5A0B7853296C06374E602729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojieEIankJUzqB63WtV6j36w== X-Mailru-Sender: 1F3202E75A95DDEFA8FDA09795F48B248655C2302DF3DFE5EC235ABF2255AFC16967BCE13AB6E3CC07784C02288277CA03E0582D3806FB6A5317862B1921BA260ED6CFD6382C13A6B0DAF586E7D11B3E67EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH vshard 1/5] router: backoff on some box errors 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" Hi! Thanks for the review! On 17.12.2021 12:09, Oleg Babin wrote: > Thanks for your patch! LGTM. But I think tests should be extended a bit. > > I see that tests cover AccessDenied error but I don't see that there is simple error()/assert() error check. I hope you meant this: ==================== diff --git a/test/router/router2.result b/test/router/router2.result index a501dbf..85d077a 100644 --- a/test/router/router2.result +++ b/test/router/router2.result @@ -548,6 +548,28 @@ vshard.storage.call = old_storage_call | --- | ... +-- +-- Fails without backoff for other errors. +-- +test_run:switch('router_1') + | --- + | - true + | ... +fiber.sleep(vshard.consts.REPLICA_BACKOFF_INTERVAL) + | --- + | ... +rs = vshard.router.route(1) + | --- + | ... +ok, err = rs:callro('vshard.storage.call', {1, 'badmode', 'echo', {100}}, \ + long_timeout) + | --- + | ... +assert(not ok and err.message:match('Unknown mode') ~= nil) + | --- + | - true + | ... + _ = test_run:switch("default") | --- | ... diff --git a/test/router/router2.test.lua b/test/router/router2.test.lua index fb0c3b2..a2171fa 100644 --- a/test/router/router2.test.lua +++ b/test/router/router2.test.lua @@ -216,6 +216,16 @@ test_run:switch('storage_2_a') assert(echo_count == 0) vshard.storage.call = old_storage_call +-- +-- Fails without backoff for other errors. +-- +test_run:switch('router_1') +fiber.sleep(vshard.consts.REPLICA_BACKOFF_INTERVAL) +rs = vshard.router.route(1) +ok, err = rs:callro('vshard.storage.call', {1, 'badmode', 'echo', {100}}, \ + long_timeout) +assert(not ok and err.message:match('Unknown mode') ~= nil) + _ = test_run:switch("default") _ = test_run:cmd("stop server router_1") _ = test_run:cmd("cleanup server router_1")