diff --git a/compute_tools/src/bin/compute_ctl.rs b/compute_tools/src/bin/compute_ctl.rs index 16fd51d79a..e337ee7b15 100644 --- a/compute_tools/src/bin/compute_ctl.rs +++ b/compute_tools/src/bin/compute_ctl.rs @@ -116,9 +116,7 @@ struct Cli { #[arg(long)] pub set_disk_quota_for_fs: Option, - // TODO(tristan957): remove alias after compatibility tests are no longer - // an issue - #[arg(short = 'c', long, alias = "spec-path")] + #[arg(short = 'c', long)] pub config: Option, #[arg(short = 'i', long, group = "compute-id")] diff --git a/control_plane/src/endpoint.rs b/control_plane/src/endpoint.rs index b569b0fb8e..4071b620d6 100644 --- a/control_plane/src/endpoint.rs +++ b/control_plane/src/endpoint.rs @@ -766,10 +766,6 @@ impl Endpoint { } }; - // TODO(tristan957): Remove the write to spec.json after compatibility - // tests work themselves out - let spec_path = self.endpoint_path().join("spec.json"); - std::fs::write(spec_path, serde_json::to_string_pretty(&config.spec)?)?; let config_path = self.endpoint_path().join("config.json"); std::fs::write(config_path, serde_json::to_string_pretty(&config)?)?; @@ -779,16 +775,6 @@ impl Endpoint { .append(true) .open(self.endpoint_path().join("compute.log"))?; - // TODO(tristan957): Remove when compatibility tests are no longer an - // issue - let old_compute_ctl = { - let mut cmd = Command::new(self.env.neon_distrib_dir.join("compute_ctl")); - let help_output = cmd.arg("--help").output()?; - let help_output = String::from_utf8_lossy(&help_output.stdout); - - !help_output.contains("--config") - }; - // Launch compute_ctl let conn_str = self.connstr("cloud_admin", "postgres"); println!("Starting postgres node at '{}'", conn_str); @@ -807,19 +793,8 @@ impl Endpoint { ]) .args(["--pgdata", self.pgdata().to_str().unwrap()]) .args(["--connstr", &conn_str]) - // TODO(tristan957): Change this to --config when compatibility tests - // are no longer an issue - .args([ - "--spec-path", - self.endpoint_path() - .join(if old_compute_ctl { - "spec.json" - } else { - "config.json" - }) - .to_str() - .unwrap(), - ]) + .arg("--config") + .arg(self.endpoint_path().join("config.json").as_os_str()) .args([ "--pgbin", self.env diff --git a/docker-compose/compute_wrapper/shell/compute.sh b/docker-compose/compute_wrapper/shell/compute.sh index 9409e9d055..723b2f8afb 100755 --- a/docker-compose/compute_wrapper/shell/compute.sh +++ b/docker-compose/compute_wrapper/shell/compute.sh @@ -81,19 +81,9 @@ sed -i "s/TIMELINE_ID/${timeline_id}/" ${CONFIG_FILE} cat ${CONFIG_FILE} -# TODO(tristan957): Remove these workarounds for backwards compatibility after -# the next compute release. That includes these next few lines and the -# --spec-path in the compute_ctl invocation. -if compute_ctl --help | grep --quiet -- '--config'; then - SPEC_PATH="$CONFIG_FILE" -else - jq '.spec' < "$CONFIG_FILE" > /tmp/spec.json - SPEC_PATH=/tmp/spec.json -fi - echo "Start compute node" /usr/local/bin/compute_ctl --pgdata /var/db/postgres/compute \ -C "postgresql://cloud_admin@localhost:55433/postgres" \ -b /usr/local/bin/postgres \ --compute-id "compute-$RANDOM" \ - --spec-path "$SPEC_PATH" + --config "$CONFIG_FILE"