Move ports from ephermal ports range: 50051->30051, 55433->30433

2026-01-14 17:02:56 +00:00 · 2024-10-08 11:57:17 +02:00
parent 17c59ed786
commit c20b23c648
12 changed files with 21 additions and 21 deletions
--- a/2
+++ b/2
@@ -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" \
--- 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
--- a/compute/Dockerfile.compute-node
+++ b/compute/Dockerfile.compute-node
@@ -1197,7 +1197,7 @@ RUN case "${PG_VERSION}" in "v17") \
    patch -p1 </ext-src/pg_cron.patch
 ENV PATH=/usr/local/pgsql/bin:$PATH
 ENV PGHOST=compute
-ENV PGPORT=55433
+ENV PGPORT=30433
 ENV PGUSER=cloud_admin
 ENV PGDATABASE=postgres
 #########################################################################################
--- a/control_plane/simple.conf
+++ b/control_plane/simple.conf
@@ -13,4 +13,4 @@ pg_port = 5454
 http_port = 7676

 [broker]
-listen_addr = '127.0.0.1:50051'
+listen_addr = '127.0.0.1:30051'
--- a/control_plane/src/local_env.rs
+++ b/control_plane/src/local_env.rs
@@ -141,7 +141,7 @@ pub struct NeonLocalInitConf {
 #[derive(Serialize, Deserialize, PartialEq, Eq, Clone, Debug)]
 #[serde(default)]
 pub struct NeonBroker {
-    /// Broker listen address for storage nodes coordination, e.g. '127.0.0.1:50051'.
+    /// Broker listen address for storage nodes coordination, e.g. '127.0.0.1:30051'.
    pub listen_addr: SocketAddr,
 }

--- a/docker-compose/compute_wrapper/var/db/postgres/specs/spec.json
+++ b/docker-compose/compute_wrapper/var/db/postgres/specs/spec.json
@@ -40,7 +40,7 @@
            },
            {
                "name": "port",
-                "value": "55433",
+                "value": "30433",
                "vartype": "integer"
            },
            {
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -49,7 +49,7 @@ services:
    environment:
      - SAFEKEEPER_ADVERTISE_URL=safekeeper1:5454
      - SAFEKEEPER_ID=1
-      - BROKER_ENDPOINT=http://storage_broker:50051
+      - BROKER_ENDPOINT=http://storage_broker:30051
      - AWS_ACCESS_KEY_ID=minio
      - AWS_SECRET_ACCESS_KEY=password
      #- RUST_BACKTRACE=1
@@ -79,7 +79,7 @@ services:
    environment:
      - SAFEKEEPER_ADVERTISE_URL=safekeeper2:5454
      - SAFEKEEPER_ID=2
-      - BROKER_ENDPOINT=http://storage_broker:50051
+      - BROKER_ENDPOINT=http://storage_broker:30051
      - AWS_ACCESS_KEY_ID=minio
      - AWS_SECRET_ACCESS_KEY=password
      #- RUST_BACKTRACE=1
@@ -109,7 +109,7 @@ services:
    environment:
      - SAFEKEEPER_ADVERTISE_URL=safekeeper3:5454
      - SAFEKEEPER_ID=3
-      - BROKER_ENDPOINT=http://storage_broker:50051
+      - BROKER_ENDPOINT=http://storage_broker:30051
      - AWS_ACCESS_KEY_ID=minio
      - AWS_SECRET_ACCESS_KEY=password
      #- RUST_BACKTRACE=1
@@ -137,10 +137,10 @@ services:
    restart: always
    image: ${REPOSITORY:-neondatabase}/neon:${TAG:-latest}
    ports:
-      - 50051:50051
+      - 30051:30051
    command:
      - "storage_broker"
-      - "--listen-addr=0.0.0.0:50051"
+      - "--listen-addr=0.0.0.0:30051"

  compute:
    restart: always
@@ -160,7 +160,7 @@ services:
      - ./compute_wrapper/var/db/postgres/specs/:/var/db/postgres/specs/
      - ./compute_wrapper/shell/:/shell/
    ports:
-      - 55433:55433 # pg protocol handler
+      - 30433:30433 # pg protocol handler
      - 3080:3080 # http endpoints
    entrypoint:
      - "/shell/compute.sh"
@@ -176,7 +176,7 @@ services:
      - "/bin/bash"
      - "-c"
    command:
-      - "until pg_isready -h compute -p 55433 -U cloud_admin ; do
+      - "until pg_isready -h compute -p 30433 -U cloud_admin ; do
            echo 'Waiting to start compute...' && sleep 1;
         done"
    depends_on:
--- a/docker-compose/pageserver_config/pageserver.toml
+++ b/docker-compose/pageserver_config/pageserver.toml
@@ -1,4 +1,4 @@
-broker_endpoint='http://storage_broker:50051'
+broker_endpoint='http://storage_broker:30051'
 pg_distrib_dir='/usr/local/'
 listen_pg_addr='0.0.0.0:6400'
 listen_http_addr='0.0.0.0:9898'
--- a/docs/docker.md
+++ b/docs/docker.md
@@ -47,7 +47,7 @@ Creating docker-compose_storage_broker_1       ... done

 2. connect compute node
 ```
-$ psql postgresql://cloud_admin:cloud_admin@localhost:55433/postgres
+$ psql postgresql://cloud_admin:cloud_admin@localhost:30433/postgres
 psql (16.3)
 Type "help" for help.

@@ -68,7 +68,7 @@ postgres=# select * from t;
 # check the container name you want to see
 $ docker ps
 CONTAINER ID   IMAGE                                              COMMAND                  CREATED         STATUS         PORTS                                                                                      NAMES
-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: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.
+You can see durable pages and WAL data in `neon` bucket.
--- 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

--- 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
 ```
--- 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";