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 46B5629D20 for ; Mon, 1 Apr 2019 10:13:53 -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 FEHPRhwqPZJs for ; Mon, 1 Apr 2019 10:13:53 -0400 (EDT) Received: from smtp59.i.mail.ru (smtp59.i.mail.ru [217.69.128.39]) (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 D68C629D06 for ; Mon, 1 Apr 2019 10:13:52 -0400 (EDT) From: avtikhon Subject: [tarantool-patches] [PATCH v1 5/6] Test misc tunning Date: Mon, 1 Apr 2019 17:13:34 +0300 Message-Id: <2878f14ee1b654e652693fba8b57a58f674d2769.1554127720.git.avtikhon@gmail.com> In-Reply-To: References: In-Reply-To: References: 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: Alexander Turenko Cc: avtikhon , tarantool-patches@freelists.org From: avtikhon --- test/replication/misc.result | 16 ++++++++-------- test/replication/misc.test.lua | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/test/replication/misc.result b/test/replication/misc.result index 5226f5f99..6ce830eaa 100644 --- a/test/replication/misc.result +++ b/test/replication/misc.result @@ -113,7 +113,7 @@ test_run:cmd("switch misc1") test_run = require('test_run').new() --- ... -box.cfg{replication_timeout = 0.01, replication_connect_timeout=0.01} +box.cfg{replication_timeout = 0.03, replication_connect_timeout=0.03} --- ... test_run:cmd("switch misc2") @@ -123,7 +123,7 @@ test_run:cmd("switch misc2") test_run = require('test_run').new() --- ... -box.cfg{replication_timeout = 0.01, replication_connect_timeout=0.01} +box.cfg{replication_timeout = 0.03, replication_connect_timeout=0.03} --- ... test_run:cmd("switch misc3") @@ -136,7 +136,7 @@ test_run = require('test_run').new() fiber=require('fiber') --- ... -box.cfg{replication_timeout = 0.01, replication_connect_timeout=0.01} +box.cfg{replication_timeout = 0.03, replication_connect_timeout=0.03} --- ... _ = box.schema.space.create('test_timeout'):create_index('pk') @@ -149,7 +149,7 @@ test_run:cmd("setopt delimiter ';'") function wait_follow(replicaA, replicaB) return test_run:wait_cond(function() return replicaA.status ~= 'follow' or replicaB.status ~= 'follow' - end, 0.01) + end, 0.1) end ; --- ... @@ -158,7 +158,7 @@ function test_timeout() local replicaB = box.info.replication[3].upstream or box.info.replication[2].upstream local follows = test_run:wait_cond(function() return replicaA.status == 'follow' or replicaB.status == 'follow' - end, 0.1) + end, 1) if not follows then error('replicas not in follow status') end for i = 0, 99 do box.space.test_timeout:replace({1}) @@ -404,7 +404,7 @@ box.schema.user.create('cluster', {password='pass'}) box.schema.user.grant('cluster', 'replication') --- ... -while box.info.replication[2] == nil do fiber.sleep(0.01) end +while box.info.replication[2] == nil do fiber.sleep(0.03) end --- ... vclock = test_run:get_vclock('default') @@ -473,7 +473,7 @@ test_run:cmd("switch misc_gh3610") --- - true ... -box.cfg{replication_connect_quorum = 0, replication_connect_timeout = 0.01} +box.cfg{replication_connect_quorum = 0, replication_connect_timeout = 0.03} --- ... box.cfg{replication = {replication, replication}} @@ -486,7 +486,7 @@ test_run:cmd("switch default") box.cfg{listen = listen} --- ... -while test_run:grep_log('misc_gh3610', 'duplicate connection') == nil do fiber.sleep(0.01) end +while test_run:grep_log('misc_gh3610', 'duplicate connection') == nil do fiber.sleep(0.03) end --- ... test_run:cmd("stop server misc_gh3610") diff --git a/test/replication/misc.test.lua b/test/replication/misc.test.lua index f60eec526..d056d30a1 100644 --- a/test/replication/misc.test.lua +++ b/test/replication/misc.test.lua @@ -43,27 +43,27 @@ test_run:create_cluster(SERVERS, "replication", {args="0.1"}) test_run:wait_fullmesh(SERVERS) test_run:cmd("switch misc1") test_run = require('test_run').new() -box.cfg{replication_timeout = 0.01, replication_connect_timeout=0.01} +box.cfg{replication_timeout = 0.03, replication_connect_timeout=0.03} test_run:cmd("switch misc2") test_run = require('test_run').new() -box.cfg{replication_timeout = 0.01, replication_connect_timeout=0.01} +box.cfg{replication_timeout = 0.03, replication_connect_timeout=0.03} test_run:cmd("switch misc3") test_run = require('test_run').new() fiber=require('fiber') -box.cfg{replication_timeout = 0.01, replication_connect_timeout=0.01} +box.cfg{replication_timeout = 0.03, replication_connect_timeout=0.03} _ = box.schema.space.create('test_timeout'):create_index('pk') test_run:cmd("setopt delimiter ';'") function wait_follow(replicaA, replicaB) return test_run:wait_cond(function() return replicaA.status ~= 'follow' or replicaB.status ~= 'follow' - end, 0.01) + end, 0.1) end ; function test_timeout() local replicaA = box.info.replication[1].upstream or box.info.replication[2].upstream local replicaB = box.info.replication[3].upstream or box.info.replication[2].upstream local follows = test_run:wait_cond(function() return replicaA.status == 'follow' or replicaB.status == 'follow' - end, 0.1) + end, 1) if not follows then error('replicas not in follow status') end for i = 0, 99 do box.space.test_timeout:replace({1}) @@ -166,7 +166,7 @@ fiber.sleep(0.1) box.schema.user.create('cluster', {password='pass'}) box.schema.user.grant('cluster', 'replication') -while box.info.replication[2] == nil do fiber.sleep(0.01) end +while box.info.replication[2] == nil do fiber.sleep(0.03) end vclock = test_run:get_vclock('default') _ = test_run:wait_vclock('misc_gh3637', vclock) @@ -194,12 +194,12 @@ listen = box.cfg.listen box.cfg{listen = ''} test_run:cmd("switch misc_gh3610") -box.cfg{replication_connect_quorum = 0, replication_connect_timeout = 0.01} +box.cfg{replication_connect_quorum = 0, replication_connect_timeout = 0.03} box.cfg{replication = {replication, replication}} test_run:cmd("switch default") box.cfg{listen = listen} -while test_run:grep_log('misc_gh3610', 'duplicate connection') == nil do fiber.sleep(0.01) end +while test_run:grep_log('misc_gh3610', 'duplicate connection') == nil do fiber.sleep(0.03) end test_run:cmd("stop server misc_gh3610") test_run:cmd("cleanup server misc_gh3610") -- 2.17.1