From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp41.i.mail.ru (smtp41.i.mail.ru [94.100.177.101]) (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 8B4B44696C7 for ; Fri, 1 May 2020 03:16:38 +0300 (MSK) From: Vladislav Shpilevoy Date: Fri, 1 May 2020 02:16:30 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH vshard 3/7] test: disable router discovery for some tests List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org, olegrok@tarantool.org There are tests, which are not related to discovery at all, and yet they suffer from unrelated changes, when something is modified in the discovery algorithm. For example, it highly affects the test about request retries and automatic timeouts. Now the discovery is disabled for such tests, since it becomes easily possible to do with the new router's configuration option. --- example/router.lua | 3 +++ test/router/exponential_timeout.result | 12 +++++++----- test/router/exponential_timeout.test.lua | 4 +++- test/router/retry_reads.result | 6 ++++-- test/router/retry_reads.test.lua | 4 +++- test/router/router.result | 9 ++++++++- test/router/router.test.lua | 5 ++++- 7 files changed, 32 insertions(+), 11 deletions(-) diff --git a/example/router.lua b/example/router.lua index 6d0b45e..23f6c65 100755 --- a/example/router.lua +++ b/example/router.lua @@ -14,6 +14,9 @@ replicasets = {'cbf06940-0790-498b-948d-042b62cf3d29', -- Call a configuration provider cfg = require('localcfg') +if arg[1] == 'discovery_disable' then + cfg.discovery_mode = 'off' +end cfg.listen = 3300 -- Start the database with sharding diff --git a/test/router/exponential_timeout.result b/test/router/exponential_timeout.result index f579382..252b816 100644 --- a/test/router/exponential_timeout.result +++ b/test/router/exponential_timeout.result @@ -28,7 +28,9 @@ util.map_evals(test_run, {REPLICASET_1, REPLICASET_2}, 'bootstrap_storage(\'memt _ = test_run:cmd("create server router_1 with script='router/router_1.lua'") --- ... -_ = test_run:cmd("start server router_1") +-- Discovery algorithm changes sometimes and should not affect the +-- exponential timeout test. +_ = test_run:cmd("start server router_1 with args='discovery_disable'") --- ... _ = test_run:switch('router_1') @@ -49,13 +51,13 @@ util.collect_timeouts(rs1) ok: 0 timeout: 0.5 - fail: 0 - ok: 1 + ok: 0 timeout: 0.5 ... util.collect_timeouts(rs2) --- - - fail: 0 - ok: 1 + ok: 0 timeout: 0.5 - fail: 0 ok: 0 @@ -74,7 +76,7 @@ util.collect_timeouts(rs1) ok: 0 timeout: 0.5 - fail: 0 - ok: 9 + ok: 8 timeout: 0.5 ... _ = rs1:callrw('echo') @@ -86,7 +88,7 @@ util.collect_timeouts(rs1) ok: 0 timeout: 0.5 - fail: 0 - ok: 1 + ok: 9 timeout: 0.5 ... -- diff --git a/test/router/exponential_timeout.test.lua b/test/router/exponential_timeout.test.lua index 75b0028..881b9a7 100644 --- a/test/router/exponential_timeout.test.lua +++ b/test/router/exponential_timeout.test.lua @@ -10,7 +10,9 @@ util.wait_master(test_run, REPLICASET_1, 'storage_1_a') util.wait_master(test_run, REPLICASET_2, 'storage_2_a') util.map_evals(test_run, {REPLICASET_1, REPLICASET_2}, 'bootstrap_storage(\'memtx\')') _ = test_run:cmd("create server router_1 with script='router/router_1.lua'") -_ = test_run:cmd("start server router_1") +-- Discovery algorithm changes sometimes and should not affect the +-- exponential timeout test. +_ = test_run:cmd("start server router_1 with args='discovery_disable'") _ = test_run:switch('router_1') util = require('util') diff --git a/test/router/retry_reads.result b/test/router/retry_reads.result index ae60267..fa38541 100644 --- a/test/router/retry_reads.result +++ b/test/router/retry_reads.result @@ -28,7 +28,9 @@ util.map_evals(test_run, {REPLICASET_1, REPLICASET_2}, 'bootstrap_storage(\'memt _ = test_run:cmd("create server router_1 with script='router/router_1.lua'") --- ... -_ = test_run:cmd("start server router_1") +-- Discovery algorithm changes sometimes and should not affect the +-- read retry decisions. +_ = test_run:cmd("start server router_1 with args='discovery_disable'") --- ... _ = test_run:switch('router_1') @@ -53,7 +55,7 @@ util.collect_timeouts(rs1) ok: 0 timeout: 0.5 - fail: 0 - ok: 1 + ok: 0 timeout: 0.5 ... _ = rs1:callro('sleep', {min_timeout + 0.5}, {timeout = min_timeout}) diff --git a/test/router/retry_reads.test.lua b/test/router/retry_reads.test.lua index c1fb689..390436a 100644 --- a/test/router/retry_reads.test.lua +++ b/test/router/retry_reads.test.lua @@ -10,7 +10,9 @@ util.wait_master(test_run, REPLICASET_1, 'storage_1_a') util.wait_master(test_run, REPLICASET_2, 'storage_2_a') util.map_evals(test_run, {REPLICASET_1, REPLICASET_2}, 'bootstrap_storage(\'memtx\')') _ = test_run:cmd("create server router_1 with script='router/router_1.lua'") -_ = test_run:cmd("start server router_1") +-- Discovery algorithm changes sometimes and should not affect the +-- read retry decisions. +_ = test_run:cmd("start server router_1 with args='discovery_disable'") _ = test_run:switch('router_1') util = require('util') diff --git a/test/router/router.result b/test/router/router.result index d85f718..267a3e9 100644 --- a/test/router/router.result +++ b/test/router/router.result @@ -31,7 +31,8 @@ util.push_rs_filters(test_run) _ = test_run:cmd("create server router_1 with script='router/router_1.lua'") --- ... -_ = test_run:cmd("start server router_1") +-- Discovery should not interfere in some first tests. +_ = test_run:cmd("start server router_1 with args='discovery_disable'") --- ... _ = test_run:switch("router_1") @@ -697,6 +698,12 @@ vshard.router.call(bucket_id, 'write', 'vshard.storage.bucket_recv', {new_bid, ' -- -- Monitoring -- +cfg.discovery_mode = 'on' +--- +... +vshard.router.discovery_set('on') +--- +... -- All is ok, when all servers are up. -- gh-103: show bucket info for each replicaset. info = vshard.router.info() diff --git a/test/router/router.test.lua b/test/router/router.test.lua index abc1a3c..c36026d 100644 --- a/test/router/router.test.lua +++ b/test/router/router.test.lua @@ -9,7 +9,8 @@ util.wait_master(test_run, REPLICASET_2, 'storage_2_a') util.map_evals(test_run, {REPLICASET_1, REPLICASET_2}, 'bootstrap_storage(\'memtx\')') util.push_rs_filters(test_run) _ = test_run:cmd("create server router_1 with script='router/router_1.lua'") -_ = test_run:cmd("start server router_1") +-- Discovery should not interfere in some first tests. +_ = test_run:cmd("start server router_1 with args='discovery_disable'") _ = test_run:switch("router_1") -- gh-46: Ensure a cfg is not destroyed after router.cfg(). @@ -242,6 +243,8 @@ vshard.router.call(bucket_id, 'write', 'vshard.storage.bucket_recv', {new_bid, ' -- Monitoring -- +cfg.discovery_mode = 'on' +vshard.router.discovery_set('on') -- All is ok, when all servers are up. -- gh-103: show bucket info for each replicaset. info = vshard.router.info() -- 2.21.1 (Apple Git-122.3)