From c20b23c6486eed43d05f4cd209972290f59efbcb Mon Sep 17 00:00:00 2001 From: Fedor Dikarev Date: Tue, 8 Oct 2024 11:57:17 +0200 Subject: [PATCH] Move ports from ephermal ports range: 50051->30051, 55433->30433 --- Dockerfile | 2 +- README.md | 2 +- compute/Dockerfile.compute-node | 2 +- control_plane/simple.conf | 2 +- control_plane/src/local_env.rs | 2 +- .../var/db/postgres/specs/spec.json | 2 +- docker-compose/docker-compose.yml | 14 +++++++------- docker-compose/pageserver_config/pageserver.toml | 2 +- docs/docker.md | 6 +++--- docs/settings.md | 4 ++-- docs/storage_broker.md | 2 +- storage_broker/src/lib.rs | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index bdb76a4f4f..3129e6c109 100644 --- a/Dockerfile +++ b/Dockerfile @@ -91,7 +91,7 @@ COPY --from=pg-build /home/nonroot/postgres_install.tar.gz /data/ # Now, when `docker run ... pageserver` is run, it can start without errors, yet will have some default dummy values. RUN mkdir -p /data/.neon/ && \ echo "id=1234" > "/data/.neon/identity.toml" && \ - echo "broker_endpoint='http://storage_broker:50051'\n" \ + echo "broker_endpoint='http://storage_broker:30051'\n" \ "pg_distrib_dir='/usr/local/'\n" \ "listen_pg_addr='0.0.0.0:6400'\n" \ "listen_http_addr='0.0.0.0:9898'\n" \ diff --git a/README.md b/README.md index cfc63b4708..7f7a831281 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ Initializing pageserver node 1 at '127.0.0.1:64000' in ".neon" # start pageserver, safekeeper, and broker for their intercommunication > cargo neon start -Starting neon broker at 127.0.0.1:50051. +Starting neon broker at 127.0.0.1:30051. storage_broker started, pid: 2918372 Starting pageserver node 1 at '127.0.0.1:64000' in ".neon". pageserver started, pid: 2918386 diff --git a/compute/Dockerfile.compute-node b/compute/Dockerfile.compute-node index 5332b9ca1f..30cc2d021a 100644 --- a/compute/Dockerfile.compute-node +++ b/compute/Dockerfile.compute-node @@ -1197,7 +1197,7 @@ RUN case "${PG_VERSION}" in "v17") \ patch -p1 3080/tcp, :::3080->3080/tcp, 0.0.0.0:55433->55433/tcp, :::55433->55433/tcp docker-compose_compute_1 +3582f6d76227 docker-compose_compute "/shell/compute.sh" 2 minutes ago Up 2 minutes 0.0.0.0:3080->3080/tcp, :::3080->3080/tcp, 0.0.0.0:30433->30433/tcp, :::30433->30433/tcp docker-compose_compute_1 (...omit...) $ docker logs -f docker-compose_compute_1 @@ -84,4 +84,4 @@ Access http://localhost:9001 and sign in. - Username: `minio` - Password: `password` -You can see durable pages and WAL data in `neon` bucket. \ No newline at end of file +You can see durable pages and WAL data in `neon` bucket. diff --git a/docs/settings.md b/docs/settings.md index 12a6a4c171..915157d382 100644 --- a/docs/settings.md +++ b/docs/settings.md @@ -24,7 +24,7 @@ max_file_descriptors = '100' # initial superuser role name to use when creating a new tenant initial_superuser_name = 'cloud_admin' -broker_endpoint = 'http://127.0.0.1:50051' +broker_endpoint = 'http://127.0.0.1:30051' # [remote_storage] ``` @@ -51,7 +51,7 @@ Note that TOML distinguishes between strings and integers, the former require si #### broker_endpoint A storage broker endpoint to connect and pull the information from. Default is -`'http://127.0.0.1:50051'`. +`'http://127.0.0.1:30051'`. #### checkpoint_distance diff --git a/docs/storage_broker.md b/docs/storage_broker.md index 827fe5c5f2..7aa5ddb06a 100644 --- a/docs/storage_broker.md +++ b/docs/storage_broker.md @@ -23,5 +23,5 @@ Broker serves /metrics on the same port as grpc service. grpcurl can be used to check which values are currently being pushed: ``` -grpcurl -proto broker/proto/broker.proto -d '{"all":{}}' -plaintext localhost:50051 storage_broker.BrokerService/SubscribeSafekeeperInfo +grpcurl -proto broker/proto/broker.proto -d '{"all":{}}' -plaintext localhost:30051 storage_broker.BrokerService/SubscribeSafekeeperInfo ``` diff --git a/storage_broker/src/lib.rs b/storage_broker/src/lib.rs index bc632a39f7..7b10b64121 100644 --- a/storage_broker/src/lib.rs +++ b/storage_broker/src/lib.rs @@ -26,7 +26,7 @@ pub use tonic::Streaming; pub use hyper::Uri; -pub const DEFAULT_LISTEN_ADDR: &str = "127.0.0.1:50051"; +pub const DEFAULT_LISTEN_ADDR: &str = "127.0.0.1:30051"; pub const DEFAULT_ENDPOINT: &str = const_format::formatcp!("http://{DEFAULT_LISTEN_ADDR}"); pub const DEFAULT_KEEPALIVE_INTERVAL: &str = "5000 ms";