Skip to content

Commit

Permalink
Rename binary attachment_service -> storage_controller (#7042)
Browse files Browse the repository at this point in the history
## Problem

The storage controller binary still has its historic
`attachment_service` name -- it will be painful to change this later
because we can't atomically update this repo and the helm charts used to
deploy.

Companion helm chart change:
neondatabase/helm-charts#70

## Summary of changes

- Change the name of the binary to `storage_controller`
- Skipping renaming things in the source right now: this is just to get
rid of the legacy name in external interfaces.

---------

Co-authored-by: Arpad Müller <arpad-m@users.noreply.github.com>
  • Loading branch information
jcsp and arpad-m committed Mar 7, 2024
1 parent d03ec9d commit d3c583e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ RUN set -e \
--bin pagectl \
--bin safekeeper \
--bin storage_broker \
--bin attachment_service \
--bin storage_controller \
--bin proxy \
--bin neon_local \
--locked --release \
Expand Down Expand Up @@ -81,7 +81,7 @@ COPY --from=build --chown=neon:neon /home/nonroot/target/release/pageserver
COPY --from=build --chown=neon:neon /home/nonroot/target/release/pagectl /usr/local/bin
COPY --from=build --chown=neon:neon /home/nonroot/target/release/safekeeper /usr/local/bin
COPY --from=build --chown=neon:neon /home/nonroot/target/release/storage_broker /usr/local/bin
COPY --from=build --chown=neon:neon /home/nonroot/target/release/attachment_service /usr/local/bin
COPY --from=build --chown=neon:neon /home/nonroot/target/release/storage_controller /usr/local/bin
COPY --from=build --chown=neon:neon /home/nonroot/target/release/proxy /usr/local/bin
COPY --from=build --chown=neon:neon /home/nonroot/target/release/neon_local /usr/local/bin

Expand Down
4 changes: 4 additions & 0 deletions control_plane/attachment_service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ version = "0.1.0"
edition.workspace = true
license.workspace = true

[[bin]]
name = "storage_controller"
path = "src/main.rs"

[features]
default = []
# Enables test-only APIs and behaviors
Expand Down
2 changes: 1 addition & 1 deletion control_plane/src/attachment_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pub struct AttachmentService {
client: reqwest::Client,
}

const COMMAND: &str = "attachment_service";
const COMMAND: &str = "storage_controller";

const ATTACHMENT_SERVICE_POSTGRES_VERSION: u32 = 16;

Expand Down
2 changes: 1 addition & 1 deletion control_plane/src/local_env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ impl LocalEnv {
// run from the same location as neon_local. This means that for compatibility
// tests that run old pageserver/safekeeper, they still run latest attachment service.
let neon_local_bin_dir = env::current_exe().unwrap().parent().unwrap().to_owned();
neon_local_bin_dir.join("attachment_service")
neon_local_bin_dir.join("storage_controller")
}

pub fn safekeeper_bin(&self) -> PathBuf {
Expand Down

1 comment on commit d3c583e

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2567 tests run: 2433 passed, 0 failed, 134 skipped (full report)


Flaky tests (2)

Postgres 16

  • test_pageserver_init_node_id: debug

Postgres 14

Code coverage* (full report)

  • functions: 28.8% (6992 of 24311 functions)
  • lines: 47.3% (43014 of 90873 lines)

* collected from Rust tests only


The comment gets automatically updated with the latest test results
d3c583e at 2024-03-07T14:55:23.179Z :recycle:

Please sign in to comment.