mirror of
https://github.com/neondatabase/neon.git
synced 2026-01-08 14:02:55 +00:00
1d90b1b205
* Add --id argument to safekeeper setting its unique u64 id. In preparation for storage node messaging. IDs are supposed to be monotonically assigned by the console. In tests it is issued by ZenithEnv; at the zenith cli level and fixtures, string name is completely replaced by integer id. Example TOML configs are adjusted accordingly. Sequential ids are chosen over Zid mainly because they are compact and easy to type/remember. * add node id to pageserver This adds node id parameter to pageserver configuration. Also I use a simple builder to construct pageserver config struct to avoid setting node id to some temporary invalid value. Some of the changes in test fixtures are needed to split init and start operations for envrionment. Co-authored-by: Arseny Sher <sher-ars@yandex.ru>
130 lines
4.6 KiB
Python
130 lines
4.6 KiB
Python
import json
|
|
import uuid
|
|
import requests
|
|
|
|
from psycopg2.extensions import cursor as PgCursor
|
|
from fixtures.zenith_fixtures import ZenithEnv, ZenithEnvBuilder, ZenithPageserverHttpClient
|
|
from typing import cast
|
|
|
|
|
|
def helper_compare_branch_list(pageserver_http_client: ZenithPageserverHttpClient,
|
|
env: ZenithEnv,
|
|
initial_tenant: uuid.UUID):
|
|
"""
|
|
Compare branches list returned by CLI and directly via API.
|
|
Filters out branches created by other tests.
|
|
"""
|
|
branches = pageserver_http_client.branch_list(initial_tenant)
|
|
branches_api = sorted(map(lambda b: cast(str, b['name']), branches))
|
|
branches_api = [b for b in branches_api if b.startswith('test_cli_') or b in ('empty', 'main')]
|
|
|
|
res = env.zenith_cli.list_branches()
|
|
branches_cli = sorted(map(lambda b: b.split(':')[-1].strip(), res.stdout.strip().split("\n")))
|
|
branches_cli = [b for b in branches_cli if b.startswith('test_cli_') or b in ('empty', 'main')]
|
|
|
|
res = env.zenith_cli.list_branches(tenant_id=initial_tenant)
|
|
branches_cli_with_tenant_arg = sorted(
|
|
map(lambda b: b.split(':')[-1].strip(), res.stdout.strip().split("\n")))
|
|
branches_cli_with_tenant_arg = [
|
|
b for b in branches_cli if b.startswith('test_cli_') or b in ('empty', 'main')
|
|
]
|
|
|
|
assert branches_api == branches_cli == branches_cli_with_tenant_arg
|
|
|
|
|
|
def test_cli_branch_list(zenith_simple_env: ZenithEnv):
|
|
env = zenith_simple_env
|
|
pageserver_http_client = env.pageserver.http_client()
|
|
|
|
# Initial sanity check
|
|
helper_compare_branch_list(pageserver_http_client, env, env.initial_tenant)
|
|
env.zenith_cli.create_branch("test_cli_branch_list_main", "empty")
|
|
helper_compare_branch_list(pageserver_http_client, env, env.initial_tenant)
|
|
|
|
# Create a nested branch
|
|
res = env.zenith_cli.create_branch("test_cli_branch_list_nested", "test_cli_branch_list_main")
|
|
assert res.stderr == ''
|
|
helper_compare_branch_list(pageserver_http_client, env, env.initial_tenant)
|
|
|
|
# Check that all new branches are visible via CLI
|
|
res = env.zenith_cli.list_branches()
|
|
assert res.stderr == ''
|
|
branches_cli = sorted(map(lambda b: b.split(':')[-1].strip(), res.stdout.strip().split("\n")))
|
|
|
|
assert 'test_cli_branch_list_main' in branches_cli
|
|
assert 'test_cli_branch_list_nested' in branches_cli
|
|
|
|
|
|
def helper_compare_tenant_list(pageserver_http_client: ZenithPageserverHttpClient, env: ZenithEnv):
|
|
tenants = pageserver_http_client.tenant_list()
|
|
tenants_api = sorted(map(lambda t: cast(str, t['id']), tenants))
|
|
|
|
res = env.zenith_cli.list_tenants()
|
|
assert res.stderr == ''
|
|
tenants_cli = sorted(map(lambda t: t.split()[0], res.stdout.splitlines()))
|
|
|
|
assert tenants_api == tenants_cli
|
|
|
|
|
|
def test_cli_tenant_list(zenith_simple_env: ZenithEnv):
|
|
env = zenith_simple_env
|
|
pageserver_http_client = env.pageserver.http_client()
|
|
# Initial sanity check
|
|
helper_compare_tenant_list(pageserver_http_client, env)
|
|
|
|
# Create new tenant
|
|
tenant1 = uuid.uuid4()
|
|
env.zenith_cli.create_tenant(tenant1)
|
|
|
|
# check tenant1 appeared
|
|
helper_compare_tenant_list(pageserver_http_client, env)
|
|
|
|
# Create new tenant
|
|
tenant2 = uuid.uuid4()
|
|
env.zenith_cli.create_tenant(tenant2)
|
|
|
|
# check tenant2 appeared
|
|
helper_compare_tenant_list(pageserver_http_client, env)
|
|
|
|
res = env.zenith_cli.list_tenants()
|
|
tenants = sorted(map(lambda t: t.split()[0], res.stdout.splitlines()))
|
|
|
|
assert env.initial_tenant.hex in tenants
|
|
assert tenant1.hex in tenants
|
|
assert tenant2.hex in tenants
|
|
|
|
|
|
def test_cli_ipv4_listeners(zenith_env_builder: ZenithEnvBuilder):
|
|
# Start with single sk
|
|
zenith_env_builder.num_safekeepers = 1
|
|
env = zenith_env_builder.init_start()
|
|
|
|
# Connect to sk port on v4 loopback
|
|
res = requests.get(f'http://127.0.0.1:{env.safekeepers[0].port.http}/v1/status')
|
|
assert res.ok
|
|
|
|
# FIXME Test setup is using localhost:xx in ps config.
|
|
# Perhaps consider switching test suite to v4 loopback.
|
|
|
|
# Connect to ps port on v4 loopback
|
|
# res = requests.get(f'http://127.0.0.1:{env.pageserver.service_port.http}/v1/status')
|
|
# assert res.ok
|
|
|
|
|
|
def test_cli_start_stop(zenith_env_builder: ZenithEnvBuilder):
|
|
# Start with single sk
|
|
zenith_env_builder.num_safekeepers = 1
|
|
env = zenith_env_builder.init_start()
|
|
|
|
# Stop default ps/sk
|
|
env.zenith_cli.pageserver_stop()
|
|
env.zenith_cli.safekeeper_stop()
|
|
|
|
# Default start
|
|
res = env.zenith_cli.raw_cli(["start"])
|
|
res.check_returncode()
|
|
|
|
# Default stop
|
|
res = env.zenith_cli.raw_cli(["stop"])
|
|
res.check_returncode()
|