rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-24 16:40:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename contrib/zenith to contrib/neon. Rename custom GUCs:

Browse Source 
- zenith.page_server_connstring -> neon.pageserver_connstring
- zenith.zenith_tenant -> neon.tenantid
- zenith.zenith_timeline -> neon.timelineid
- zenith.max_cluster_size -> neon.max_cluster_size
This commit is contained in:
Anastasia Lubennikova
2022-04-18 19:43:57 +03:00
committed by Anastasia Lubennikova
parent e3b320daab
commit 3accde613d
29 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test_runner/batch_others/test_ancestor_branch.py
View File

@@ -30,7 +30,7 @@ def test_ancestor_branch(zenith_env_builder: ZenithEnvBuilder):
pg_branch0 = env.postgres.create_start('main', tenant_id=tenant)
branch0_cur = pg_branch0.connect().cursor()
branch0_cur.execute("SHOW zenith.zenith_timeline")
branch0_cur.execute("SHOW neon.timelineid")
branch0_timeline = branch0_cur.fetchone()[0]
log.info(f"b0 timeline {branch0_timeline}")
@@ -55,7 +55,7 @@ def test_ancestor_branch(zenith_env_builder: ZenithEnvBuilder):
log.info("postgres is running on 'branch1' branch")
branch1_cur = pg_branch1.connect().cursor()
branch1_cur.execute("SHOW zenith.zenith_timeline")
branch1_cur.execute("SHOW neon.timelineid")
branch1_timeline = branch1_cur.fetchone()[0]
log.info(f"b1 timeline {branch1_timeline}")
@@ -79,7 +79,7 @@ def test_ancestor_branch(zenith_env_builder: ZenithEnvBuilder):
log.info("postgres is running on 'branch2' branch")
branch2_cur = pg_branch2.connect().cursor()
branch2_cur.execute("SHOW zenith.zenith_timeline")
branch2_cur.execute("SHOW neon.timelineid")
branch2_timeline = branch2_cur.fetchone()[0]
log.info(f"b2 timeline {branch2_timeline}")

2
test_runner/batch_others/test_backpressure.py
View File

@@ -26,7 +26,7 @@ def check_backpressure(pg: Postgres, stop_event: threading.Event, polling_interv
log.info("checks started")
with pg_cur(pg) as cur:
cur.execute("CREATE EXTENSION zenith") # TODO move it to zenith_fixtures?
cur.execute("CREATE EXTENSION neon") # TODO move it to zenith_fixtures?
cur.execute("select pg_size_bytes(current_setting('max_replication_write_lag'))")
res = cur.fetchone()

2
test_runner/batch_others/test_branch_behind.py
View File

@@ -31,7 +31,7 @@ def test_branch_behind(zenith_env_builder: ZenithEnvBuilder):
main_pg_conn = pgmain.connect()
main_cur = main_pg_conn.cursor()
main_cur.execute("SHOW zenith.zenith_timeline")
main_cur.execute("SHOW neon.timelineid")
timeline = main_cur.fetchone()[0]
# Create table, and insert the first 100 rows

2
test_runner/batch_others/test_broken_timeline.py
View File

@@ -26,7 +26,7 @@ def test_broken_timeline(zenith_env_builder: ZenithEnvBuilder):
cur.execute("CREATE TABLE t(key int primary key, value text)")
cur.execute("INSERT INTO t SELECT generate_series(1,100), 'payload'")
cur.execute("SHOW zenith.zenith_timeline")
cur.execute("SHOW neon.timelineid")
timeline_id = cur.fetchone()[0]
pg.stop()
tenant_timelines.append((tenant_id, timeline_id, pg))

2
test_runner/batch_others/test_clog_truncate.py
View File

@@ -29,7 +29,7 @@ def test_clog_truncate(zenith_simple_env: ZenithEnv):
log.info('postgres is running on test_clog_truncate branch')
# Install extension containing function needed for test
pg.safe_psql('CREATE EXTENSION zenith_test_utils')
pg.safe_psql('CREATE EXTENSION neon_test_utils')
# Consume many xids to advance clog
with closing(pg.connect()) as conn:

2
test_runner/batch_others/test_gc_aggressive.py
View File

@@ -62,7 +62,7 @@ def test_gc_aggressive(zenith_env_builder: ZenithEnvBuilder):
conn = pg.connect()
cur = conn.cursor()
cur.execute("SHOW zenith.zenith_timeline")
cur.execute("SHOW neon.timelineid")
timeline = cur.fetchone()[0]
# Create table, and insert the first 100 rows

2
test_runner/batch_others/test_old_request_lsn.py
View File

@@ -26,7 +26,7 @@ def test_old_request_lsn(zenith_env_builder: ZenithEnvBuilder):
cur = pg_conn.cursor()
# Get the timeline ID of our branch. We need it for the 'do_gc' command
cur.execute("SHOW zenith.zenith_timeline")
cur.execute("SHOW neon.timelineid")
timeline = cur.fetchone()[0]
psconn = env.pageserver.connect()

2
test_runner/batch_others/test_pitr_gc.py
View File

@@ -25,7 +25,7 @@ def test_pitr_gc(zenith_env_builder: ZenithEnvBuilder):
main_pg_conn = pgmain.connect()
main_cur = main_pg_conn.cursor()
main_cur.execute("SHOW zenith.zenith_timeline")
main_cur.execute("SHOW neon.timelineid")
timeline = main_cur.fetchone()[0]
# Create table

2
test_runner/batch_others/test_read_validation.py
View File

@@ -8,7 +8,7 @@ from psycopg2.errors import IoError
pytest_plugins = ("fixtures.zenith_fixtures")
extensions = ["pageinspect", "zenith_test_utils", "pg_buffercache"]
extensions = ["pageinspect", "neon_test_utils", "pg_buffercache"]
#

4
test_runner/batch_others/test_remote_storage.py
View File

@@ -48,8 +48,8 @@ def test_remote_storage_backup_and_restore(zenith_env_builder: ZenithEnvBuilder,
client = env.pageserver.http_client()
tenant_id = pg.safe_psql("show zenith.zenith_tenant")[0][0]
timeline_id = pg.safe_psql("show zenith.zenith_timeline")[0][0]
tenant_id = pg.safe_psql("show neon.tenantid")[0][0]
timeline_id = pg.safe_psql("show neon.timelineid")[0][0]
checkpoint_numbers = range(1, 3)

4
test_runner/batch_others/test_tenant_relocation.py
View File

@@ -130,7 +130,7 @@ def test_tenant_relocation(zenith_env_builder: ZenithEnvBuilder,
with closing(tenant_pg.connect()) as conn:
with conn.cursor() as cur:
# save timeline for later gc call
cur.execute("SHOW zenith.zenith_timeline")
cur.execute("SHOW neon.timelineid")
timeline = UUID(cur.fetchone()[0])
log.info("timeline to relocate %s", timeline.hex)
@@ -223,7 +223,7 @@ def test_tenant_relocation(zenith_env_builder: ZenithEnvBuilder,
tenant_pg_config_file_path = pathlib.Path(tenant_pg.config_file_path())
tenant_pg_config_file_path.open('a').write(
f"\nzenith.page_server_connstring = 'postgresql://no_user:@localhost:{new_pageserver_pg_port}'"
f"\nneon.pageserver_connstring = 'postgresql://no_user:@localhost:{new_pageserver_pg_port}'"
)
tenant_pg.start()

8
test_runner/batch_others/test_tenants_with_remote_storage.py
View File

@@ -21,8 +21,8 @@ async def tenant_workload(env: ZenithEnv, pg: Postgres):
pg_conn = await pg.connect_async()
tenant_id = await pg_conn.fetchval("show zenith.zenith_tenant")
timeline_id = await pg_conn.fetchval("show zenith.zenith_timeline")
tenant_id = await pg_conn.fetchval("show neon.tenantid")
timeline_id = await pg_conn.fetchval("show neon.timelineid")
await pg_conn.execute("CREATE TABLE t(key int primary key, value text)")
for i in range(1, 100):
@@ -82,9 +82,9 @@ def test_tenants_many(zenith_env_builder: ZenithEnvBuilder, storage_type: str):
for tenant, pg in tenants_pgs:
with closing(pg.connect()) as conn:
with conn.cursor() as cur:
cur.execute("show zenith.zenith_tenant")
cur.execute("show neon.tenantid")
tenant_id = cur.fetchone()[0]
cur.execute("show zenith.zenith_timeline")
cur.execute("show neon.timelineid")
timeline_id = cur.fetchone()[0]
cur.execute("SELECT pg_current_wal_flush_lsn()")
current_lsn = lsn_from_hex(cur.fetchone()[0])

6
test_runner/batch_others/test_timeline_size.py
View File

@@ -21,7 +21,7 @@ def test_timeline_size(zenith_simple_env: ZenithEnv):
with closing(pgmain.connect()) as conn:
with conn.cursor() as cur:
cur.execute("SHOW zenith.zenith_timeline")
cur.execute("SHOW neon.timelineid")
# Create table, and insert the first 100 rows
cur.execute("CREATE TABLE foo (t text)")
@@ -81,12 +81,12 @@ def test_timeline_size_quota(zenith_env_builder: ZenithEnvBuilder):
pgmain = env.postgres.create_start(
"test_timeline_size_quota",
# Set small limit for the test
config_lines=['zenith.max_cluster_size=30MB'])
config_lines=['neon.max_cluster_size=30MB'])
log.info("postgres is running on 'test_timeline_size_quota' branch")
with closing(pgmain.connect()) as conn:
with conn.cursor() as cur:
cur.execute("CREATE EXTENSION zenith") # TODO move it to zenith_fixtures?
cur.execute("CREATE EXTENSION neon") # TODO move it to zenith_fixtures?
cur.execute("CREATE TABLE foo (t text)")

2
test_runner/batch_others/test_vm_bits.py
View File

@@ -17,7 +17,7 @@ def test_vm_bit_clear(zenith_simple_env: ZenithEnv):
cur = pg_conn.cursor()
# Install extension containing function needed for test
cur.execute('CREATE EXTENSION zenith_test_utils')
cur.execute('CREATE EXTENSION neon_test_utils')
# Create a test table and freeze it to set the VM bit.
cur.execute('CREATE TABLE vmtest_delete (id integer PRIMARY KEY)')

24
test_runner/batch_others/test_wal_acceptor.py
View File

@@ -337,8 +337,8 @@ def test_broker(zenith_env_builder: ZenithEnvBuilder):
pg.safe_psql("CREATE TABLE t(key int primary key, value text)")
# learn zenith timeline from compute
tenant_id = pg.safe_psql("show zenith.zenith_tenant")[0][0]
timeline_id = pg.safe_psql("show zenith.zenith_timeline")[0][0]
tenant_id = pg.safe_psql("show neon.tenantid")[0][0]
timeline_id = pg.safe_psql("show neon.timelineid")[0][0]
# wait until remote_consistent_lsn gets advanced on all safekeepers
clients = [sk.http_client() for sk in env.safekeepers]
@@ -384,8 +384,8 @@ def test_wal_removal(zenith_env_builder: ZenithEnvBuilder):
cur.execute('CREATE TABLE t(key int primary key, value text)')
cur.execute("INSERT INTO t SELECT generate_series(1,100000), 'payload'")
tenant_id = pg.safe_psql("show zenith.zenith_tenant")[0][0]
timeline_id = pg.safe_psql("show zenith.zenith_timeline")[0][0]
tenant_id = pg.safe_psql("show neon.tenantid")[0][0]
timeline_id = pg.safe_psql("show neon.timelineid")[0][0]
# force checkpoint to advance remote_consistent_lsn
with closing(env.pageserver.connect()) as psconn:
@@ -497,10 +497,10 @@ class ProposerPostgres(PgProtocol):
with open(self.config_file_path(), "w") as f:
cfg = [
"synchronous_standby_names = 'walproposer'\n",
"shared_preload_libraries = 'zenith'\n",
f"zenith.zenith_timeline = '{self.timeline_id.hex}'\n",
f"zenith.zenith_tenant = '{self.tenant_id.hex}'\n",
f"zenith.page_server_connstring = ''\n",
"shared_preload_libraries = 'neon'\n",
f"neon.timelineid = '{self.timeline_id.hex}'\n",
f"neon.tenantid = '{self.tenant_id.hex}'\n",
f"neon.pageserver_connstring = ''\n",
f"wal_acceptors = '{safekeepers}'\n",
f"listen_addresses = '{self.listen_addr}'\n",
f"port = '{self.port}'\n",
@@ -612,8 +612,8 @@ def test_timeline_status(zenith_env_builder: ZenithEnvBuilder):
wa_http_cli.check_status()
# learn zenith timeline from compute
tenant_id = pg.safe_psql("show zenith.zenith_tenant")[0][0]
timeline_id = pg.safe_psql("show zenith.zenith_timeline")[0][0]
tenant_id = pg.safe_psql("show neon.tenantid")[0][0]
timeline_id = pg.safe_psql("show neon.timelineid")[0][0]
# fetch something sensible from status
tli_status = wa_http_cli.timeline_status(tenant_id, timeline_id)
@@ -798,8 +798,8 @@ def test_replace_safekeeper(zenith_env_builder: ZenithEnvBuilder):
pg.start()
# learn zenith timeline from compute
tenant_id = pg.safe_psql("show zenith.zenith_tenant")[0][0]
timeline_id = pg.safe_psql("show zenith.zenith_timeline")[0][0]
tenant_id = pg.safe_psql("show neon.tenantid")[0][0]
timeline_id = pg.safe_psql("show neon.timelineid")[0][0]
execute_payload(pg)
show_statuses(env.safekeepers, tenant_id, timeline_id)

4
test_runner/batch_others/test_wal_acceptor_async.py
View File

@@ -151,8 +151,8 @@ async def run_restarts_under_load(env: ZenithEnv,
test_timeout_at = time.monotonic() + 5 * 60
pg_conn = await pg.connect_async()
tenant_id = await pg_conn.fetchval("show zenith.zenith_tenant")
timeline_id = await pg_conn.fetchval("show zenith.zenith_timeline")
tenant_id = await pg_conn.fetchval("show neon.tenantid")
timeline_id = await pg_conn.fetchval("show neon.timelineid")
bank = BankClient(pg_conn, n_accounts=n_accounts, init_amount=init_amount)
# create tables and initial balances

2
test_runner/batch_others/test_wal_restore.py
View File

@@ -19,7 +19,7 @@ def test_wal_restore(zenith_env_builder: ZenithEnvBuilder,
env.zenith_cli.create_branch("test_wal_restore")
pg = env.postgres.create_start('test_wal_restore')
pg.safe_psql("create table t as select generate_series(1,300000)")
tenant_id = pg.safe_psql("show zenith.zenith_tenant")[0][0]
tenant_id = pg.safe_psql("show neon.tenantid")[0][0]
env.zenith_cli.pageserver_stop()
port = port_distributor.get_port()
data_dir = os.path.join(test_output_dir, 'pgsql.restored')

2
test_runner/fixtures/compare_fixtures.py
View File

@@ -66,7 +66,7 @@ class ZenithCompare(PgCompare):
# We only use one branch and one timeline
self.env.zenith_cli.create_branch(branch_name, 'empty')
self._pg = self.env.postgres.create_start(branch_name)
self.timeline = self.pg.safe_psql("SHOW zenith.zenith_timeline")[0][0]
self.timeline = self.pg.safe_psql("SHOW neon.timelineid")[0][0]
# Long-lived cursor, useful for flushing
self.psconn = self.env.pageserver.connect()

2
test_runner/fixtures/zenith_fixtures.py
View File

@@ -2039,7 +2039,7 @@ def check_restored_datadir_content(test_output_dir: str, env: ZenithEnv, pg: Pos
# Get the timeline ID. We need it for the 'basebackup' command
with closing(pg.connect()) as conn:
with conn.cursor() as cur:
cur.execute("SHOW zenith.zenith_timeline")
cur.execute("SHOW neon.timelineid")
timeline = cur.fetchone()[0]
# stop postgres to ensure that files won't change