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 C4AFF6F3C7; Fri, 26 Mar 2021 16:58:01 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C4AFF6F3C7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1616767081; bh=h3ffrDr+/pnVXmax7vudAS93Yqx5THeg52yUPANjTs8=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=Et0XBtu6ydep40WhlxJefbyaQ568qUE4pLnjfb6iqyavBQAuqPTAkURFebxdngLkq flkaQq76MiXvkq5goS0iamMTlHyVpvVyzA7tC11dNb1DaS6GUM9ktbjIZ+n+bPuwnp //SNnC2ujEQM4i31OT0l7j94eomwB7hgyIU8Xgfg= Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 9AAD56F3C7 for ; Fri, 26 Mar 2021 16:58:00 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 9AAD56F3C7 Received: by mail-lj1-f177.google.com with SMTP id u4so7482661ljo.6 for ; Fri, 26 Mar 2021 06:58:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=AGuZZ2sp8n9GILAkFyHqZwkcw7R7V1lNfUlcmKVkArE=; b=VgKDSOSt9svbDIK76HnDjx7bGc1JjBLpb22s24kw4adPP32JgPNvhWJ26VRGdgwJ8O ixS5vPZImFrjjXdMKmnER/kgObQQqOAufAU8wUuioKpHlwvPJyjXFqBWzSSTJ1XcSU7J NertsfUxaK9Hs0B8j/NYunBDax9k623apvB2q9UPp5PtCVJjZCpLWowRofx3mMVuHGRg hD72iwyNKJiCP80eszLdNZ2iF78F5ZEsjU22v1JTUOvhrayPGpsRrqCLTrRvY4XWmeev DQ4o/vGXUhljJBfnnsxHFaGuQfBid++HxSNRlK8oeOPf2K3ZqZCROAXUhpauCnkm49l7 hUDw== X-Gm-Message-State: AOAM531eieIXPZLR5d7NdYn+WDRqNlTQd6xkqP5CIfhoW2Bvdtk5OtHN 9xtoaZOBk214urKIFf6Q16CT9c8cpAdAcg== X-Google-Smtp-Source: ABdhPJx9aDOcmVa3mmeJnu6QkdXfZcIVdsvMJIyoOkgWnELJergY0maExZKybTSwse6/DSTGaJnWzw== X-Received: by 2002:a2e:8e78:: with SMTP id t24mr9301348ljk.161.1616767079460; Fri, 26 Mar 2021 06:57:59 -0700 (PDT) Received: from grain.localdomain ([5.18.171.94]) by smtp.gmail.com with ESMTPSA id k30sm1130145ljc.140.2021.03.26.06.57.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Mar 2021 06:57:58 -0700 (PDT) Received: by grain.localdomain (Postfix, from userid 1000) id B703C560179; Fri, 26 Mar 2021 16:57:57 +0300 (MSK) Date: Fri, 26 Mar 2021 16:57:57 +0300 To: Serge Petrenko Message-ID: References: <20210326120605.2160131-1-gorcunov@gmail.com> <20210326120605.2160131-3-gorcunov@gmail.com> <7d84bf90-7306-ad25-9f0f-74867c100fad@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <7d84bf90-7306-ad25-9f0f-74867c100fad@tarantool.org> User-Agent: Mutt/2.0.5 (2021-01-21) Subject: Re: [Tarantool-patches] [PATCH v5 2/3] test: add a test for wal_cleanup_delay 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: Cyrill Gorcunov via Tarantool-patches Reply-To: Cyrill Gorcunov Cc: tml , Vladislav Shpilevoy Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" On Fri, Mar 26, 2021 at 04:37:26PM +0300, Serge Petrenko wrote: > > +box.cfg({ > > + listen = os.getenv("LISTEN"), > > + replication = os.getenv("MASTER"), > > +}) > > Hi! Thanks for the fixes! > > You may  use `replica.lua` here freely. It takes the same parameters, and > has the same > box.cfg() call, with exception that it has set `replication_timeout` and > `memtx_memory`. > These two options are not a problem. In fact, `replica.lua` is used in > almost all > replication tests. > > So, there's no reason to spawn a new file for your needs. Indeed, pushed an update. --- diff --git a/test/replication/gh-5806-slave.lua b/test/replication/gh-5806-slave.lua deleted file mode 100644 index 3abb3e035..000000000 --- a/test/replication/gh-5806-slave.lua +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env tarantool - -require('console').listen(os.getenv('ADMIN')) - -box.cfg({ - listen = os.getenv("LISTEN"), - replication = os.getenv("MASTER"), -}) diff --git a/test/replication/gh-5806-xlog-cleanup.result b/test/replication/gh-5806-xlog-cleanup.result index e20784bcc..523d400a7 100644 --- a/test/replication/gh-5806-xlog-cleanup.result +++ b/test/replication/gh-5806-xlog-cleanup.result @@ -64,7 +64,7 @@ test_run:switch('default') | - true | ... test_run:cmd('create server replica with rpl_master=master,\ - script="replication/gh-5806-slave.lua"') + script="replication/replica.lua"') | --- | - true | ... @@ -239,7 +239,7 @@ test_run:switch('default') | - true | ... test_run:cmd('create server replica with rpl_master=master,\ - script="replication/gh-5806-slave.lua"') + script="replication/replica.lua"') | --- | - true | ... @@ -372,7 +372,7 @@ test_run:switch('default') | - true | ... test_run:cmd('create server replica with rpl_master=master,\ - script="replication/gh-5806-slave.lua"') + script="replication/replica.lua"') | --- | - true | ... diff --git a/test/replication/gh-5806-xlog-cleanup.test.lua b/test/replication/gh-5806-xlog-cleanup.test.lua index ea3a35294..f16be758a 100644 --- a/test/replication/gh-5806-xlog-cleanup.test.lua +++ b/test/replication/gh-5806-xlog-cleanup.test.lua @@ -35,7 +35,7 @@ _ = s:create_index('pk') test_run:switch('default') test_run:cmd('create server replica with rpl_master=master,\ - script="replication/gh-5806-slave.lua"') + script="replication/replica.lua"') test_run:cmd('start server replica with wait=True, wait_load=True') -- @@ -118,7 +118,7 @@ _ = s:create_index('pk') test_run:switch('default') test_run:cmd('create server replica with rpl_master=master,\ - script="replication/gh-5806-slave.lua"') + script="replication/replica.lua"') test_run:cmd('start server replica with wait=True, wait_load=True') test_run:switch('replica') @@ -167,7 +167,7 @@ box.schema.user.grant('guest', 'replication') test_run:switch('default') test_run:cmd('create server replica with rpl_master=master,\ - script="replication/gh-5806-slave.lua"') + script="replication/replica.lua"') test_run:cmd('start server replica with wait=True, wait_load=True') test_run:switch('master')