From 85a75117009967ed88a2966dbb9683354cfef463 Mon Sep 17 00:00:00 2001 From: Alek Westover Date: Wed, 21 Jun 2023 12:42:17 -0400 Subject: [PATCH] remove extraneous argv passing --- ALEK_LIST_FILES.txt | 2 +- control_plane/src/bin/neon_local.rs | 3 +-- test_runner/fixtures/neon_fixtures.py | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ALEK_LIST_FILES.txt b/ALEK_LIST_FILES.txt index 17b430abb5..eb78122949 100644 --- a/ALEK_LIST_FILES.txt +++ b/ALEK_LIST_FILES.txt @@ -1 +1 @@ -[RemotePath("tenants/75b0fcfc4874117b656b89640d29bcc1/timelines/b67a8af543c4d5e222f98345b8028a14/000000000000000000000000000000000000-FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF__000000000169B098-000000000169B111"), RemotePath("tenants/75b0fcfc4874117b656b89640d29bcc1/timelines/b67a8af543c4d5e222f98345b8028a14/index_part.json"), RemotePath("tenants/b2fbcd019b422e552505cbeab214eebf/timelines/27228ae7a75f4cefbf08ab17cf591030/000000000000000000000000000000000000-FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF__000000000169B098-000000000169B111"), RemotePath("tenants/b2fbcd019b422e552505cbeab214eebf/timelines/27228ae7a75f4cefbf08ab17cf591030/index_part.json"), RemotePath("tenants/b2fbcd019b422e552505cbeab214eebf/timelines/65e175c0d402139051ebf7353ddc737c/000000000000000000000000000000000000-FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF__000000000169B098-000000000169B111"), RemotePath("tenants/b2fbcd019b422e552505cbeab214eebf/timelines/65e175c0d402139051ebf7353ddc737c/index_part.json"), RemotePath("v15/share/extension/test_ext.control")] \ No newline at end of file +[RemotePath("tenants/6810db134e89f13adf7c18bb28e01134/timelines/144233037159e56e413ee0fc57ad801c/000000000000000000000000000000000000-FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF__000000000169B098-000000000169B111"), RemotePath("tenants/6810db134e89f13adf7c18bb28e01134/timelines/144233037159e56e413ee0fc57ad801c/index_part.json"), RemotePath("tenants/ba2b4f2dd797a534f5cbed833a829c0a/timelines/606d928c7fb4c43f78e2b1f01ea39a84/000000000000000000000000000000000000-FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF__000000000169B098-000000000169B111"), RemotePath("tenants/ba2b4f2dd797a534f5cbed833a829c0a/timelines/606d928c7fb4c43f78e2b1f01ea39a84/index_part.json"), RemotePath("tenants/ba2b4f2dd797a534f5cbed833a829c0a/timelines/77a3b18b639675d46e53922bc4afc444/000000000000000000000000000000000000-FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF__000000000169B098-000000000169B111"), RemotePath("tenants/ba2b4f2dd797a534f5cbed833a829c0a/timelines/77a3b18b639675d46e53922bc4afc444/index_part.json"), RemotePath("v15/share/extension/test_ext.control")] \ No newline at end of file diff --git a/control_plane/src/bin/neon_local.rs b/control_plane/src/bin/neon_local.rs index b0c632f7e3..1813770f54 100644 --- a/control_plane/src/bin/neon_local.rs +++ b/control_plane/src/bin/neon_local.rs @@ -1149,7 +1149,6 @@ fn cli() -> Command { .required(false)) .arg(pg_version_arg.clone()) .arg(hot_standby_arg.clone()) - .arg(remote_ext_config_args.clone()) // TODO: is this right? ) .subcommand(Command::new("start") .about("Start postgres.\n If the endpoint doesn't exist yet, it is created.") @@ -1163,7 +1162,7 @@ fn cli() -> Command { .arg(pg_version_arg) .arg(hot_standby_arg) .arg(safekeepers_arg) - .arg(remote_ext_config_args.clone()) // TODO: is this right? // update: probably only start and not create needs this + .arg(remote_ext_config_args.clone()) ) .subcommand( Command::new("stop") diff --git a/test_runner/fixtures/neon_fixtures.py b/test_runner/fixtures/neon_fixtures.py index b985f9b7f3..f8b90de557 100644 --- a/test_runner/fixtures/neon_fixtures.py +++ b/test_runner/fixtures/neon_fixtures.py @@ -1478,8 +1478,6 @@ class NeonCli(AbstractNeonCli): args.append(endpoint_id) if hot_standby: args.extend(["--hot-standby", "true"]) - if remote_ext_config is not None: - args.extend(["--remote-ext-config", remote_ext_config]) res = self.raw_cli(args) res.check_returncode() @@ -2353,7 +2351,6 @@ class Endpoint(PgProtocol): hot_standby=hot_standby, pg_port=self.pg_port, http_port=self.http_port, - remote_ext_config=remote_ext_config, ) path = Path("endpoints") / self.endpoint_id / "pgdata" self.pgdata_dir = os.path.join(self.env.repo_dir, path)