bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

cql-pytest: add "--vnodes" option to "run" script

Browse Source 
Running test/cql-pytest/run now defaults to enabling the "tablets"
experimental feature when running Scylla - and tests detect this and
use this feature as appropriate. This is the correct default going
forward, but in the short term it would be nice to also have an
option to easily do a manual test run *without* tablets.

So this patch adds a "--vnodes" option to the test/cql-pytest/run
script. This option causes "run" to run Scylla without enabling the
"tablets" experimental feature.

Signed-off-by: Nadav Har'El <nyh@scylladb.com>

Closes scylladb/scylladb#16896
This commit is contained in:
Nadav Har'El
2024-01-21 11:03:50 +02:00
committed by Botond Dénes
parent a462b914cb
commit 0bef50ef0c
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/cql-pytest/run
View File

@@ -14,6 +14,19 @@ else:
cmd = run.run_scylla_cmd cmd = run.run_scylla_cmd
check_cql = run.check_cql check_cql = run.check_cql
# If the "--vnodes" option is given, drop the "tablets" experimental
# feature (turned on in run.py) so that all tests will be run with the
# old vnode-based replication instead of tablets. This option only has
# temporary usefulness, and should eventually be removed.
if '--vnodes' in sys.argv:
sys.argv.remove('--vnodes')
def run_without_tablets(pid, dir):
(c, e) = run_without_tablets.orig_cmd(pid, dir)
c.remove('--experimental-features=tablets')
return (c, e)
run_without_tablets.orig_cmd = cmd
cmd = run_without_tablets
if "-h" in sys.argv or "--help" in sys.argv: if "-h" in sys.argv or "--help" in sys.argv:
run.run_pytest(sys.path[0], sys.argv) run.run_pytest(sys.path[0], sys.argv)
exit(0) exit(0)