From 32560e75d22ceb92b9b765be61dc63991e0ddae3 Mon Sep 17 00:00:00 2001 From: bojanserafimov Date: Tue, 5 Jul 2022 08:27:57 -0400 Subject: [PATCH] Enable relocation test (#1974) --- .../batch_others/test_tenant_relocation.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/test_runner/batch_others/test_tenant_relocation.py b/test_runner/batch_others/test_tenant_relocation.py index 18ec34b02e..0239b17494 100644 --- a/test_runner/batch_others/test_tenant_relocation.py +++ b/test_runner/batch_others/test_tenant_relocation.py @@ -101,10 +101,6 @@ def load(pg: Postgres, stop_event: threading.Event, load_ok_event: threading.Eve log.info('load thread stopped') -@pytest.mark.skip( - reason= - "needs to replace callmemaybe call with better idea how to migrate timelines between pageservers" -) @pytest.mark.parametrize('with_load', ['with_load', 'without_load']) def test_tenant_relocation(neon_env_builder: NeonEnvBuilder, port_distributor: PortDistributor, @@ -202,17 +198,6 @@ def test_tenant_relocation(neon_env_builder: NeonEnvBuilder, lsn_from_hex(timeline_detail['local']['disk_consistent_lsn']), 0.03) - # callmemaybe to start replication from safekeeper to the new pageserver - # when there is no load there is a clean checkpoint and no wal delta - # needs to be streamed to the new pageserver - # TODO (rodionov) use attach to start replication - with pg_cur(PgProtocol(host='localhost', port=new_pageserver_pg_port)) as cur: - # "callmemaybe {} {} host={} port={} options='-c ztimelineid={} ztenantid={}'" - safekeeper_connstring = f"host=localhost port={env.safekeepers[0].port.pg} options='-c ztimelineid={timeline} ztenantid={tenant} pageserver_connstr=postgresql://no_user:@localhost:{new_pageserver_pg_port}'" - cur.execute("callmemaybe {} {} {}".format(tenant.hex, - timeline.hex, - safekeeper_connstring)) - tenant_pg.stop() # rewrite neon cli config to use new pageserver for basebackup to start new compute