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 0F6226EC70; Sat, 12 Jun 2021 00:59:38 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 0F6226EC70 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1623448778; bh=+oTJL1Db2kz7IUhDms/0VsAg8ldaOQ7EFV3uYyB0eKM=; 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=jOfKoo5IRxKWGn6eH58hZs/+AogMBSHXx5A+Glve+ILCWbKCeVTOSPP85ljQrLOS4 yrIzvz3pWnh+2O9IHIj5Exh8hTlJ1NxDUS16kzNeL7ApM0suntsRU3B7w2HYAcrsob E51Tf7opzFiBuTpa5A3h+fPWf8lWSxwWqIYTftBs= 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 dev.tarantool.org (Postfix) with ESMTPS id BD1056EC70 for ; Sat, 12 Jun 2021 00:56:26 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BD1056EC70 Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1lrp8c-0008JK-09; Sat, 12 Jun 2021 00:56:26 +0300 To: tarantool-patches@dev.tarantool.org, gorcunov@gmail.com, sergepetrenko@tarantool.org Date: Fri, 11 Jun 2021 23:56:10 +0200 Message-Id: <69c1012338d9e08fca08ea99b6f8d8c13205d289.1623448465.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: 4F1203BC0FB41BD9D5B0DA836B685C540E30C2BDD69416C6E46C178CD572CB10182A05F538085040B0A3B1BBF06558A7F2A6DD295EC7EF15C7F94313C74FE0695A57B32D6F637A1D X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7AC43A7B4C36B769DEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637B28E90C11C329EF18638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D84ACBF4AE67DD27DD9292EF71ACE58415117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6B1CFA6D474D4A6A4089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C978317387390EF8EF1240C527CFD643BC0A42 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C8874A2D3FA5089FE53619424E69B860B37A7EF1319F5DAD59C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF31C0090ACECF247D699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34D2AC226BFD455724A00C71205C4B77E9A745FE1EC7D07321EE111A9CCB550584AAA6CE55F00A0D791D7E09C32AA3244C1B693406E5C963E9B4AFCB3CFE0663855595C85A795C7BAEFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojQR1NM653rVFqIVQzQC2wyQ== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822B4547AAA95055959C50D7B583235C7C13841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH 02/13] test: remove replica-applier-rollback.lua 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 script name was too long. It was also used as a name for the unix socket file on which the replica listens. As a result, the test couldn't start, at least on my machine. Besides, the script was not any different from the existing replica.lua, except a couple of not important settings. The patch drops it and makes gh-4730-applier-rollback.test.lua use replica.lua. Now it can run on my machine. Done as a preparation for #6027, which is slightly related to the test - it is also about errors in applier and their display. --- test/replication/gh-4730-applier-rollback.result | 2 +- .../gh-4730-applier-rollback.test.lua | 2 +- test/replication/replica-applier-rollback.lua | 16 ---------------- 3 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 test/replication/replica-applier-rollback.lua diff --git a/test/replication/gh-4730-applier-rollback.result b/test/replication/gh-4730-applier-rollback.result index 26a0eb6fa..bd9530074 100644 --- a/test/replication/gh-4730-applier-rollback.result +++ b/test/replication/gh-4730-applier-rollback.result @@ -19,7 +19,7 @@ box.schema.user.grant('guest', 'replication') -- -- Create replica instance, we're the master and -- start it, no data to sync yet though -test_run:cmd("create server replica_slave with rpl_master=default, script='replication/replica-applier-rollback.lua'") +test_run:cmd("create server replica_slave with rpl_master=default, script='replication/replica.lua'") | --- | - true | ... diff --git a/test/replication/gh-4730-applier-rollback.test.lua b/test/replication/gh-4730-applier-rollback.test.lua index de7a740de..a010debb4 100644 --- a/test/replication/gh-4730-applier-rollback.test.lua +++ b/test/replication/gh-4730-applier-rollback.test.lua @@ -12,7 +12,7 @@ box.schema.user.grant('guest', 'replication') -- -- Create replica instance, we're the master and -- start it, no data to sync yet though -test_run:cmd("create server replica_slave with rpl_master=default, script='replication/replica-applier-rollback.lua'") +test_run:cmd("create server replica_slave with rpl_master=default, script='replication/replica.lua'") test_run:cmd("start server replica_slave") -- diff --git a/test/replication/replica-applier-rollback.lua b/test/replication/replica-applier-rollback.lua deleted file mode 100644 index 26fb10055..000000000 --- a/test/replication/replica-applier-rollback.lua +++ /dev/null @@ -1,16 +0,0 @@ --- --- vim: ts=4 sw=4 et --- - -print('arg', arg) - -box.cfg({ - replication = os.getenv("MASTER"), - listen = os.getenv("LISTEN"), - memtx_memory = 107374182, - replication_timeout = 0.1, - replication_connect_timeout = 0.5, - read_only = true, -}) - -require('console').listen(os.getenv('ADMIN')) -- 2.24.3 (Apple Git-128)