Skip to content

Commit 8e4161e

Browse files
authored
Merge pull request #9617 from neondatabase/rc/2024-11-04
Storage & Compute release 2024-11-04
2 parents e369c58 + 8ad1dbc commit 8e4161e

File tree

81 files changed

+3670
-2263
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+3670
-2263
lines changed

Diff for: Cargo.lock

+24-128
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ reqwest-retry = "0.5"
143143
routerify = "3"
144144
rpds = "0.13"
145145
rustc-hash = "1.1.0"
146-
rustls = "0.23"
146+
rustls = { version = "0.23.16", default-features = false }
147147
rustls-pemfile = "2"
148148
scopeguard = "1.1"
149149
sysinfo = "0.29.2"
@@ -174,7 +174,7 @@ tokio = { version = "1.17", features = ["macros"] }
174174
tokio-epoll-uring = { git = "https://github.com/neondatabase/tokio-epoll-uring.git" , branch = "main" }
175175
tokio-io-timeout = "1.2.0"
176176
tokio-postgres-rustls = "0.12.0"
177-
tokio-rustls = "0.26"
177+
tokio-rustls = { version = "0.26.0", default-features = false, features = ["tls12", "ring"]}
178178
tokio-stream = "0.1"
179179
tokio-tar = "0.3"
180180
tokio-util = { version = "0.7.10", features = ["io", "rt"] }

Diff for: build-tools.Dockerfile

+12
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,18 @@ RUN set -e \
5757
zstd \
5858
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
5959

60+
# sql_exporter
61+
62+
# Keep the version the same as in compute/compute-node.Dockerfile and
63+
# test_runner/regress/test_compute_metrics.py.
64+
ENV SQL_EXPORTER_VERSION=0.13.1
65+
RUN curl -fsSL \
66+
"https://github.com/burningalchemist/sql_exporter/releases/download/${SQL_EXPORTER_VERSION}/sql_exporter-${SQL_EXPORTER_VERSION}.linux-$(case "$(uname -m)" in x86_64) echo amd64;; aarch64) echo arm64;; esac).tar.gz" \
67+
--output sql_exporter.tar.gz \
68+
&& mkdir /tmp/sql_exporter \
69+
&& tar xzvf sql_exporter.tar.gz -C /tmp/sql_exporter --strip-components=1 \
70+
&& mv /tmp/sql_exporter/sql_exporter /usr/local/bin/sql_exporter
71+
6072
# protobuf-compiler (protoc)
6173
ENV PROTOC_VERSION=25.1
6274
RUN curl -fsSL "https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-$(uname -m | sed 's/aarch64/aarch_64/g').zip" -o "protoc.zip" \

0 commit comments

Comments
 (0)