From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Sergei Voronezhskii Subject: [PATCH 1/4] test: cleanup replication tests, parallel mode on Date: Fri, 5 Oct 2018 12:02:12 +0300 Message-Id: <20181005090215.6160-2-sergw@tarantool.org> In-Reply-To: <20181005090215.6160-1-sergw@tarantool.org> References: <20181003145057.68820-1-sergw@tarantool.org> <20181005090215.6160-1-sergw@tarantool.org> Reply-To: tarantool-patches@freelists.org To: tarantool-patches@freelists.org Cc: Alexander Turenko , Vladimir Davydov List-ID: - at the end of tests which create any replication config need to call `test_run:clenup_cluster()` which clears `box.space._cluster` - switch on `use_unix_sockets` because of 'Address already in use' problems - test `once` need to clean `once*` schemas Part of #2436, #3232 --- test/replication/before_replace.result | 3 ++ test/replication/before_replace.test.lua | 1 + test/replication/catch.result | 3 ++ test/replication/catch.test.lua | 1 + test/replication/local_spaces.result | 3 ++ test/replication/local_spaces.test.lua | 1 + test/replication/misc.result | 44 +++++++++++++++++---- test/replication/misc.test.lua | 23 +++++++---- test/replication/on_replace.result | 10 +++++ test/replication/on_replace.test.lua | 3 ++ test/replication/once.result | 12 ++++++ test/replication/once.test.lua | 3 ++ test/replication/quorum.result | 9 +++-- test/replication/quorum.test.lua | 7 ++-- test/replication/replica_rejoin.result | 7 ++++ test/replication/replica_rejoin.test.lua | 2 + test/replication/skip_conflict_row.result | 7 ++++ test/replication/skip_conflict_row.test.lua | 2 + test/replication/status.result | 7 ++++ test/replication/status.test.lua | 2 + test/replication/suite.ini | 3 +- test/replication/sync.result | 7 ++++ test/replication/sync.test.lua | 2 + test/replication/wal_off.result | 7 ++++ test/replication/wal_off.test.lua | 2 + 25 files changed, 148 insertions(+), 23 deletions(-) diff --git a/test/replication/before_replace.result b/test/replication/before_replace.result index 858a52de6..87973b6d1 100644 --- a/test/replication/before_replace.result +++ b/test/replication/before_replace.result @@ -223,3 +223,6 @@ test_run:cmd("switch default") test_run:drop_cluster(SERVERS) --- ... +test_run:cleanup_cluster() +--- +... diff --git a/test/replication/before_replace.test.lua b/test/replication/before_replace.test.lua index f1e590703..bcd264521 100644 --- a/test/replication/before_replace.test.lua +++ b/test/replication/before_replace.test.lua @@ -80,3 +80,4 @@ box.space.test:select() -- Cleanup. test_run:cmd("switch default") test_run:drop_cluster(SERVERS) +test_run:cleanup_cluster() diff --git a/test/replication/catch.result b/test/replication/catch.result index aebba819f..e23f33cef 100644 --- a/test/replication/catch.result +++ b/test/replication/catch.result @@ -130,6 +130,9 @@ test_run:cmd("cleanup server replica") --- - true ... +test_run:cleanup_cluster() +--- +... box.space.test:drop() --- ... diff --git a/test/replication/catch.test.lua b/test/replication/catch.test.lua index 8cc3242f7..217328772 100644 --- a/test/replication/catch.test.lua +++ b/test/replication/catch.test.lua @@ -59,6 +59,7 @@ errinj.set("ERRINJ_RELAY_TIMEOUT", 0) -- cleanup test_run:cmd("stop server replica") test_run:cmd("cleanup server replica") +test_run:cleanup_cluster() box.space.test:drop() box.schema.user.revoke('guest', 'replication') diff --git a/test/replication/local_spaces.result b/test/replication/local_spaces.result index 151735530..4de223261 100644 --- a/test/replication/local_spaces.result +++ b/test/replication/local_spaces.result @@ -216,6 +216,9 @@ test_run:cmd("cleanup server replica") --- - true ... +test_run:cleanup_cluster() +--- +... box.schema.user.revoke('guest', 'replication') --- ... diff --git a/test/replication/local_spaces.test.lua b/test/replication/local_spaces.test.lua index 06e2b0bd2..633cc9f1a 100644 --- a/test/replication/local_spaces.test.lua +++ b/test/replication/local_spaces.test.lua @@ -76,6 +76,7 @@ box.space.test3:select() test_run:cmd("switch default") test_run:cmd("stop server replica") test_run:cmd("cleanup server replica") +test_run:cleanup_cluster() box.schema.user.revoke('guest', 'replication') s1:select() diff --git a/test/replication/misc.result b/test/replication/misc.result index f8aa8dab6..c0c7d482d 100644 --- a/test/replication/misc.result +++ b/test/replication/misc.result @@ -88,6 +88,13 @@ test_run:cmd('cleanup server test') box.cfg{read_only = false} --- ... +test_run:cmd('delete server test') +--- +- true +... +test_run:cleanup_cluster() +--- +... -- gh-3160 - Send heartbeats if there are changes from a remote master only SERVERS = { 'autobootstrap1', 'autobootstrap2', 'autobootstrap3' } --- @@ -229,6 +236,9 @@ test_run:cmd("switch default") test_run:drop_cluster(SERVERS) --- ... +test_run:cleanup_cluster() +--- +... -- gh-3642 - Check that socket file descriptor doesn't leak -- when a replica is disconnected. rlimit = require('rlimit') @@ -249,15 +259,15 @@ lim.rlim_cur = 64 rlimit.setrlimit(rlimit.RLIMIT_NOFILE, lim) --- ... -test_run:cmd('create server sock with rpl_master=default, script="replication/replica.lua"') +test_run:cmd('create server bork with rpl_master=default, script="replication/replica.lua"') --- - true ... -test_run:cmd(string.format('start server sock')) +test_run:cmd('start server bork') --- - true ... -test_run:cmd('switch sock') +test_run:cmd('switch bork') --- - true ... @@ -299,14 +309,21 @@ lim.rlim_cur = old_fno rlimit.setrlimit(rlimit.RLIMIT_NOFILE, lim) --- ... -test_run:cmd('stop server sock') +test_run:cmd("stop server bork") +--- +- true +... +test_run:cmd("cleanup server bork") --- - true ... -test_run:cmd('cleanup server sock') +test_run:cmd("delete server bork") --- - true ... +test_run:cleanup_cluster() +--- +... box.schema.user.revoke('guest', 'replication') --- ... @@ -342,6 +359,17 @@ test_run:cmd('cleanup server er_load2') --- - true ... +test_run:cmd('delete server er_load1') +--- +- true +... +test_run:cmd('delete server er_load2') +--- +- true +... +test_run:cleanup_cluster() +--- +... -- -- Test case for gh-3637. Before the fix replica would exit with -- an error. Now check that we don't hang and successfully connect. @@ -349,9 +377,6 @@ test_run:cmd('cleanup server er_load2') fiber = require('fiber') --- ... -test_run:cleanup_cluster() ---- -... test_run:cmd("create server replica_auth with rpl_master=default, script='replication/replica_auth.lua'") --- - true @@ -391,6 +416,9 @@ test_run:cmd("delete server replica_auth") --- - true ... +test_run:cleanup_cluster() +--- +... box.schema.user.drop('cluster') --- ... diff --git a/test/replication/misc.test.lua b/test/replication/misc.test.lua index 46726b7f4..375c8b58a 100644 --- a/test/replication/misc.test.lua +++ b/test/replication/misc.test.lua @@ -32,6 +32,8 @@ test_run:cmd(string.format('start server test with args="%s"', replica_uuid)) test_run:cmd('stop server test') test_run:cmd('cleanup server test') box.cfg{read_only = false} +test_run:cmd('delete server test') +test_run:cleanup_cluster() -- gh-3160 - Send heartbeats if there are changes from a remote master only SERVERS = { 'autobootstrap1', 'autobootstrap2', 'autobootstrap3' } @@ -89,6 +91,7 @@ box.space.space1:drop() test_run:cmd("switch default") test_run:drop_cluster(SERVERS) +test_run:cleanup_cluster() -- gh-3642 - Check that socket file descriptor doesn't leak -- when a replica is disconnected. @@ -99,9 +102,9 @@ old_fno = lim.rlim_cur lim.rlim_cur = 64 rlimit.setrlimit(rlimit.RLIMIT_NOFILE, lim) -test_run:cmd('create server sock with rpl_master=default, script="replication/replica.lua"') -test_run:cmd(string.format('start server sock')) -test_run:cmd('switch sock') +test_run:cmd('create server bork with rpl_master=default, script="replication/replica.lua"') +test_run:cmd('start server bork') +test_run:cmd('switch bork') test_run = require('test_run').new() fiber = require('fiber') test_run:cmd("setopt delimiter ';'") @@ -122,8 +125,10 @@ test_run:cmd('switch default') lim.rlim_cur = old_fno rlimit.setrlimit(rlimit.RLIMIT_NOFILE, lim) -test_run:cmd('stop server sock') -test_run:cmd('cleanup server sock') +test_run:cmd("stop server bork") +test_run:cmd("cleanup server bork") +test_run:cmd("delete server bork") +test_run:cleanup_cluster() box.schema.user.revoke('guest', 'replication') @@ -138,15 +143,15 @@ test_run:cmd('stop server er_load1') -- er_load2 exits automatically. test_run:cmd('cleanup server er_load1') test_run:cmd('cleanup server er_load2') +test_run:cmd('delete server er_load1') +test_run:cmd('delete server er_load2') +test_run:cleanup_cluster() -- -- Test case for gh-3637. Before the fix replica would exit with -- an error. Now check that we don't hang and successfully connect. -- fiber = require('fiber') - -test_run:cleanup_cluster() - test_run:cmd("create server replica_auth with rpl_master=default, script='replication/replica_auth.lua'") test_run:cmd("start server replica_auth with wait=False, wait_load=False, args='cluster:pass 0.05'") -- Wait a bit to make sure replica waits till user is created. @@ -161,6 +166,8 @@ _ = test_run:wait_vclock('replica_auth', vclock) test_run:cmd("stop server replica_auth") test_run:cmd("cleanup server replica_auth") test_run:cmd("delete server replica_auth") +test_run:cleanup_cluster() + box.schema.user.drop('cluster') -- diff --git a/test/replication/on_replace.result b/test/replication/on_replace.result index 4ffa3b25a..8fef8fb14 100644 --- a/test/replication/on_replace.result +++ b/test/replication/on_replace.result @@ -88,6 +88,13 @@ test_run:cmd("cleanup server replica") --- - true ... +test_run:cmd("delete server replica") +--- +- true +... +test_run:cleanup_cluster() +--- +... box.space.test:drop() --- ... @@ -177,3 +184,6 @@ _ = test_run:cmd('switch default') test_run:drop_cluster(SERVERS) --- ... +test_run:cleanup_cluster() +--- +... diff --git a/test/replication/on_replace.test.lua b/test/replication/on_replace.test.lua index 371b71cbd..23a3313b5 100644 --- a/test/replication/on_replace.test.lua +++ b/test/replication/on_replace.test.lua @@ -37,6 +37,8 @@ test_run:cmd("switch default") -- test_run:cmd("stop server replica") test_run:cmd("cleanup server replica") +test_run:cmd("delete server replica") +test_run:cleanup_cluster() box.space.test:drop() box.schema.user.revoke('guest', 'replication') @@ -73,3 +75,4 @@ box.space.s2:select() _ = test_run:cmd('switch default') test_run:drop_cluster(SERVERS) +test_run:cleanup_cluster() diff --git a/test/replication/once.result b/test/replication/once.result index 99ac05b72..fd787915e 100644 --- a/test/replication/once.result +++ b/test/replication/once.result @@ -85,3 +85,15 @@ once -- 1 box.cfg{read_only = false} --- ... +box.space._schema:delete{"oncero"} +--- +- ['oncero'] +... +box.space._schema:delete{"oncekey"} +--- +- ['oncekey'] +... +box.space._schema:delete{"oncetest"} +--- +- ['oncetest'] +... diff --git a/test/replication/once.test.lua b/test/replication/once.test.lua index 264c63670..813fbfdab 100644 --- a/test/replication/once.test.lua +++ b/test/replication/once.test.lua @@ -28,3 +28,6 @@ box.cfg{read_only = true} box.once("ro", f, 1) -- ok, already done once -- 1 box.cfg{read_only = false} +box.space._schema:delete{"oncero"} +box.space._schema:delete{"oncekey"} +box.space._schema:delete{"oncetest"} diff --git a/test/replication/quorum.result b/test/replication/quorum.result index 265b099b7..2642fe8f4 100644 --- a/test/replication/quorum.result +++ b/test/replication/quorum.result @@ -435,18 +435,21 @@ test_run:cmd('switch default') --- - true ... -test_run:cmd('stop server replica_quorum') +test_run:cmd("stop server replica_quorum") --- - true ... -test_run:cmd('cleanup server replica_quorum') +test_run:cmd("cleanup server replica_quorum") --- - true ... -test_run:cmd('delete server replica_quorum') +test_run:cmd("delete server replica_quorum") --- - true ... +test_run:cleanup_cluster() +--- +... box.schema.user.revoke('guest', 'replication') --- ... diff --git a/test/replication/quorum.test.lua b/test/replication/quorum.test.lua index 5a43275c2..24d1b27c4 100644 --- a/test/replication/quorum.test.lua +++ b/test/replication/quorum.test.lua @@ -166,7 +166,8 @@ test_run:cmd('switch replica_quorum') box.cfg{replication={INSTANCE_URI, nonexistent_uri(1)}} box.info.id test_run:cmd('switch default') -test_run:cmd('stop server replica_quorum') -test_run:cmd('cleanup server replica_quorum') -test_run:cmd('delete server replica_quorum') +test_run:cmd("stop server replica_quorum") +test_run:cmd("cleanup server replica_quorum") +test_run:cmd("delete server replica_quorum") +test_run:cleanup_cluster() box.schema.user.revoke('guest', 'replication') diff --git a/test/replication/replica_rejoin.result b/test/replication/replica_rejoin.result index 4370fae4b..37849850f 100644 --- a/test/replication/replica_rejoin.result +++ b/test/replication/replica_rejoin.result @@ -242,6 +242,13 @@ test_run:cmd("cleanup server replica") --- - true ... +test_run:cmd("delete server replica") +--- +- true +... +test_run:cleanup_cluster() +--- +... box.space.test:drop() --- ... diff --git a/test/replication/replica_rejoin.test.lua b/test/replication/replica_rejoin.test.lua index f998f60d0..950ec7532 100644 --- a/test/replication/replica_rejoin.test.lua +++ b/test/replication/replica_rejoin.test.lua @@ -87,5 +87,7 @@ box.space.test:select() test_run:cmd("switch default") test_run:cmd("stop server replica") test_run:cmd("cleanup server replica") +test_run:cmd("delete server replica") +test_run:cleanup_cluster() box.space.test:drop() box.schema.user.revoke('guest', 'replication') diff --git a/test/replication/skip_conflict_row.result b/test/replication/skip_conflict_row.result index 29963f56a..6ca13b472 100644 --- a/test/replication/skip_conflict_row.result +++ b/test/replication/skip_conflict_row.result @@ -91,6 +91,13 @@ test_run:cmd("cleanup server replica") --- - true ... +test_run:cmd("delete server replica") +--- +- true +... +test_run:cleanup_cluster() +--- +... box.space.test:drop() --- ... diff --git a/test/replication/skip_conflict_row.test.lua b/test/replication/skip_conflict_row.test.lua index 5f7d6ead3..4406ced95 100644 --- a/test/replication/skip_conflict_row.test.lua +++ b/test/replication/skip_conflict_row.test.lua @@ -31,5 +31,7 @@ box.info.status -- cleanup test_run:cmd("stop server replica") test_run:cmd("cleanup server replica") +test_run:cmd("delete server replica") +test_run:cleanup_cluster() box.space.test:drop() box.schema.user.revoke('guest', 'replication') diff --git a/test/replication/status.result b/test/replication/status.result index 8394b98c1..9e69f2478 100644 --- a/test/replication/status.result +++ b/test/replication/status.result @@ -391,3 +391,10 @@ test_run:cmd("cleanup server replica") --- - true ... +test_run:cmd("delete server replica") +--- +- true +... +test_run:cleanup_cluster() +--- +... diff --git a/test/replication/status.test.lua b/test/replication/status.test.lua index 8bb25e0c6..cfdf6acdb 100644 --- a/test/replication/status.test.lua +++ b/test/replication/status.test.lua @@ -142,3 +142,5 @@ test_run:cmd('switch default') box.schema.user.revoke('guest', 'replication') test_run:cmd("stop server replica") test_run:cmd("cleanup server replica") +test_run:cmd("delete server replica") +test_run:cleanup_cluster() diff --git a/test/replication/suite.ini b/test/replication/suite.ini index f4abc7af1..5cbc371c2 100644 --- a/test/replication/suite.ini +++ b/test/replication/suite.ini @@ -6,5 +6,6 @@ disabled = consistent.test.lua release_disabled = catch.test.lua errinj.test.lua gc.test.lua before_replace.test.lua quorum.test.lua recover_missing_xlog.test.lua sync.test.lua config = suite.cfg lua_libs = lua/fast_replica.lua lua/rlimit.lua +use_unix_sockets = True long_run = prune.test.lua -is_parallel = False +is_parallel = True diff --git a/test/replication/sync.result b/test/replication/sync.result index 81de60758..b2381ac59 100644 --- a/test/replication/sync.result +++ b/test/replication/sync.result @@ -303,6 +303,13 @@ test_run:cmd("cleanup server replica") --- - true ... +test_run:cmd("delete server replica") +--- +- true +... +test_run:cleanup_cluster() +--- +... box.space.test:drop() --- ... diff --git a/test/replication/sync.test.lua b/test/replication/sync.test.lua index a5cfab8de..51131667d 100644 --- a/test/replication/sync.test.lua +++ b/test/replication/sync.test.lua @@ -145,6 +145,8 @@ test_run:grep_log('replica', 'ER_CFG.*') test_run:cmd("switch default") test_run:cmd("stop server replica") test_run:cmd("cleanup server replica") +test_run:cmd("delete server replica") +test_run:cleanup_cluster() box.space.test:drop() box.schema.user.revoke('guest', 'replication') diff --git a/test/replication/wal_off.result b/test/replication/wal_off.result index e3b5709e9..e0ae84bd7 100644 --- a/test/replication/wal_off.result +++ b/test/replication/wal_off.result @@ -107,6 +107,13 @@ test_run:cmd("cleanup server wal_off") --- - true ... +test_run:cmd("delete server wal_off") +--- +- true +... +test_run:cleanup_cluster() +--- +... box.schema.user.revoke('guest', 'replication') --- ... diff --git a/test/replication/wal_off.test.lua b/test/replication/wal_off.test.lua index 81fcf0b33..110f2f1f7 100644 --- a/test/replication/wal_off.test.lua +++ b/test/replication/wal_off.test.lua @@ -37,5 +37,7 @@ box.cfg { replication = "" } test_run:cmd("stop server wal_off") test_run:cmd("cleanup server wal_off") +test_run:cmd("delete server wal_off") +test_run:cleanup_cluster() box.schema.user.revoke('guest', 'replication') -- 2.18.0