gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-23 04:39:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #314 from rustfs/feature/upgrade-version

Browse Source 
Feature/upgrade version and readme.md
This commit is contained in:
houseme
2025-04-11 22:44:52 +08:00
committed by GitHub
parent 33a0b9669c eb58ca0d8d
commit d76d60a295
19 changed files with 137 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.docker/Dockerfile.devenv
+4 -4
View File
@@ -7,12 +7,12 @@ RUN sed -i s@http://.*archive.ubuntu.com@http://repo.huaweicloud.com@g /etc/apt/
RUN apt-get clean && apt-get update && apt-get install wget git curl unzip gcc pkg-config libssl-dev lld libdbus-1-dev libwayland-dev libwebkit2gtk-4.1-dev libxdo-dev -y RUN apt-get clean && apt-get update && apt-get install wget git curl unzip gcc pkg-config libssl-dev lld libdbus-1-dev libwayland-dev libwebkit2gtk-4.1-dev libxdo-dev -y
# install protoc # install protoc
RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protoc-27.0-linux-x86_64.zip \ RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-x86_64.zip \
&& unzip protoc-27.0-linux-x86_64.zip -d protoc3 \ && unzip protoc-30.2-linux-x86_64.zip -d protoc3 \
&& mv protoc3/bin/* /usr/local/bin/ && chmod +x /usr/local/bin/protoc && mv protoc3/include/* /usr/local/include/ && rm -rf protoc-27.0-linux-x86_64.zip protoc3 && mv protoc3/bin/* /usr/local/bin/ && chmod +x /usr/local/bin/protoc && mv protoc3/include/* /usr/local/include/ && rm -rf protoc-30.2-linux-x86_64.zip protoc3
# install flatc # install flatc
RUN wget https://github.com/google/flatbuffers/releases/download/v24.3.25/Linux.flatc.binary.g++-13.zip \ RUN wget https://github.com/google/flatbuffers/releases/download/v25.2.10/Linux.flatc.binary.g++-13.zip \
&& unzip Linux.flatc.binary.g++-13.zip \ && unzip Linux.flatc.binary.g++-13.zip \
&& mv flatc /usr/local/bin/ && chmod +x /usr/local/bin/flatc && rm -rf Linux.flatc.binary.g++-13.zip && mv flatc /usr/local/bin/ && chmod +x /usr/local/bin/flatc && rm -rf Linux.flatc.binary.g++-13.zip
.docker/Dockerfile.rockylinux9.3
+4 -4
View File
@@ -13,13 +13,13 @@ RUN dnf makecache
RUN yum install wget git unzip gcc openssl-devel pkgconf-pkg-config -y RUN yum install wget git unzip gcc openssl-devel pkgconf-pkg-config -y
# install protoc # install protoc
RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protoc-27.0-linux-x86_64.zip \ RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-x86_64.zip \
&& unzip protoc-27.0-linux-x86_64.zip -d protoc3 \ && unzip protoc-30.2-linux-x86_64.zip -d protoc3 \
&& mv protoc3/bin/* /usr/local/bin/ && chmod +x /usr/local/bin/protoc \ && mv protoc3/bin/* /usr/local/bin/ && chmod +x /usr/local/bin/protoc \
&& rm -rf protoc-27.0-linux-x86_64.zip protoc3 && rm -rf protoc-30.2-linux-x86_64.zip protoc3
# install flatc # install flatc
RUN wget https://github.com/google/flatbuffers/releases/download/v24.3.25/Linux.flatc.binary.g++-13.zip \ RUN wget https://github.com/google/flatbuffers/releases/download/v25.2.10/Linux.flatc.binary.g++-13.zip \
&& unzip Linux.flatc.binary.g++-13.zip \ && unzip Linux.flatc.binary.g++-13.zip \
&& mv flatc /usr/local/bin/ && chmod +x /usr/local/bin/flatc \ && mv flatc /usr/local/bin/ && chmod +x /usr/local/bin/flatc \
&& rm -rf Linux.flatc.binary.g++-13.zip && rm -rf Linux.flatc.binary.g++-13.zip
.docker/Dockerfile.ubuntu22.04
+4 -4
View File
@@ -7,12 +7,12 @@ RUN sed -i s@http://.*archive.ubuntu.com@http://repo.huaweicloud.com@g /etc/apt/
RUN apt-get clean && apt-get update && apt-get install wget git curl unzip gcc pkg-config libssl-dev lld libdbus-1-dev libwayland-dev libwebkit2gtk-4.1-dev libxdo-dev -y RUN apt-get clean && apt-get update && apt-get install wget git curl unzip gcc pkg-config libssl-dev lld libdbus-1-dev libwayland-dev libwebkit2gtk-4.1-dev libxdo-dev -y
# install protoc # install protoc
RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protoc-27.0-linux-x86_64.zip \ RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-x86_64.zip \
&& unzip protoc-27.0-linux-x86_64.zip -d protoc3 \ && unzip protoc-30.2-linux-x86_64.zip -d protoc3 \
&& mv protoc3/bin/* /usr/local/bin/ && chmod +x /usr/local/bin/protoc && mv protoc3/include/* /usr/local/include/ && rm -rf protoc-27.0-linux-x86_64.zip protoc3 && mv protoc3/bin/* /usr/local/bin/ && chmod +x /usr/local/bin/protoc && mv protoc3/include/* /usr/local/include/ && rm -rf protoc-30.2-linux-x86_64.zip protoc3
# install flatc # install flatc
RUN wget https://github.com/google/flatbuffers/releases/download/v24.3.25/Linux.flatc.binary.g++-13.zip \ RUN wget https://github.com/google/flatbuffers/releases/download/v25.2.10/Linux.flatc.binary.g++-13.zip \
&& unzip Linux.flatc.binary.g++-13.zip \ && unzip Linux.flatc.binary.g++-13.zip \
&& mv flatc /usr/local/bin/ && chmod +x /usr/local/bin/flatc && rm -rf Linux.flatc.binary.g++-13.zip && mv flatc /usr/local/bin/ && chmod +x /usr/local/bin/flatc && rm -rf Linux.flatc.binary.g++-13.zip
Cargo.lock
Generated
+48 -55
View File
@@ -809,9 +809,9 @@ dependencies = [
[[package]] [[package]]
name = "backon" name = "backon"
version = "1.4.1" version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "970d91570c01a8a5959b36ad7dd1c30642df24b6b3068710066f6809f7033bb7" checksum = "fd0b50b1b78dbadd44ab18b3c794e496f3a139abb9fbc27d9c94c4eebbb96496"
dependencies = [ dependencies = [
"fastrand", "fastrand",
"gloo-timers", "gloo-timers",
@@ -923,9 +923,9 @@ dependencies = [
[[package]] [[package]]
name = "blake3" name = "blake3"
version = "1.8.0" version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34a796731680be7931955498a16a10b2270c7762963d5d570fdbfe02dcbf314f" checksum = "389a099b34312839e16420d499a9cad9650541715937ffbdd40d36f49e77eeb3"
dependencies = [ dependencies = [
"arrayref", "arrayref",
"arrayvec", "arrayvec",
@@ -1089,9 +1089,9 @@ dependencies = [
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.2.17" version = "1.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a" checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362"
dependencies = [ dependencies = [
"jobserver", "jobserver",
"libc", "libc",
@@ -1426,7 +1426,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"toml", "toml",
"winnow 0.7.4", "winnow 0.7.6",
"yaml-rust2", "yaml-rust2",
] ]
@@ -1448,9 +1448,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
[[package]] [[package]]
name = "const-oid" name = "const-oid"
version = "0.10.0" version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cb3c4a0d3776f7535c32793be81d6d5fec0d48ac70955d9834e643aa249a52f" checksum = "0dabb6555f92fb9ee4140454eb5dcd14c7960e1225c6d1a6cc361f032947713e"
[[package]] [[package]]
name = "const-random" name = "const-random"
@@ -1681,9 +1681,9 @@ dependencies = [
[[package]] [[package]]
name = "crossbeam-channel" name = "crossbeam-channel"
version = "0.5.14" version = "0.5.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
dependencies = [ dependencies = [
"crossbeam-utils", "crossbeam-utils",
] ]
@@ -2379,9 +2379,9 @@ dependencies = [
[[package]] [[package]]
name = "deranged" name = "deranged"
version = "0.4.1" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058" checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
dependencies = [ dependencies = [
"powerfmt", "powerfmt",
"serde", "serde",
@@ -2450,7 +2450,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c478574b20020306f98d61c8ca3322d762e1ff08117422ac6106438605ea516" checksum = "6c478574b20020306f98d61c8ca3322d762e1ff08117422ac6106438605ea516"
dependencies = [ dependencies = [
"block-buffer 0.11.0-rc.4", "block-buffer 0.11.0-rc.4",
"const-oid 0.10.0", "const-oid 0.10.1",
"crypto-common 0.2.0-rc.2", "crypto-common 0.2.0-rc.2",
"subtle", "subtle",
] ]
@@ -3180,9 +3180,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
[[package]] [[package]]
name = "errno" name = "errno"
version = "0.3.10" version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
dependencies = [ dependencies = [
"libc", "libc",
"windows-sys 0.59.0", "windows-sys 0.59.0",
@@ -3860,9 +3860,9 @@ dependencies = [
[[package]] [[package]]
name = "half" name = "half"
version = "2.5.0" version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7db2ff139bba50379da6aa0766b52fdcb62cb5b263009b09ed58ba604e14bbd1" checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"crunchy", "crunchy",
@@ -4790,9 +4790,9 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
[[package]] [[package]]
name = "linux-raw-sys" name = "linux-raw-sys"
version = "0.9.3" version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413" checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
[[package]] [[package]]
name = "litemap" name = "litemap"
@@ -5033,9 +5033,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.8.5" version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5" checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
dependencies = [ dependencies = [
"adler2", "adler2",
"simd-adler32", "simd-adler32",
@@ -5668,15 +5668,14 @@ dependencies = [
[[package]] [[package]]
name = "opentelemetry-prometheus" name = "opentelemetry-prometheus"
version = "0.29.0" version = "0.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ac8c4fc7bd450bcb5b1cbc7325755e86d9f82f1fd80ad8b3441887b715f6a2d" checksum = "098a71a4430bb712be6130ed777335d2e5b19bc8566de5f2edddfce906def6ab"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"opentelemetry", "opentelemetry",
"opentelemetry_sdk", "opentelemetry_sdk",
"prometheus", "prometheus",
"protobuf 2.28.0",
"tracing", "tracing",
] ]
@@ -5851,7 +5850,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"libc", "libc",
"redox_syscall 0.5.10", "redox_syscall 0.5.11",
"smallvec", "smallvec",
"windows-targets 0.52.6", "windows-targets 0.52.6",
] ]
@@ -6351,9 +6350,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
[[package]] [[package]]
name = "prettyplease" name = "prettyplease"
version = "0.2.31" version = "0.2.32"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5316f57387668042f561aae71480de936257848f9c43ce528e311d89a07cadeb" checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"syn 2.0.100", "syn 2.0.100",
@@ -6440,17 +6439,17 @@ dependencies = [
[[package]] [[package]]
name = "prometheus" name = "prometheus"
version = "0.13.4" version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" checksum = "3ca5326d8d0b950a9acd87e6a3f94745394f62e4dae1b1ee22b2bc0c394af43a"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"fnv", "fnv",
"lazy_static", "lazy_static",
"memchr", "memchr",
"parking_lot 0.12.3", "parking_lot 0.12.3",
"protobuf 2.28.0", "protobuf",
"thiserror 1.0.69", "thiserror 2.0.12",
] ]
[[package]] [[package]]
@@ -6505,12 +6504,6 @@ dependencies = [
"prost", "prost",
] ]
[[package]]
name = "protobuf"
version = "2.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
[[package]] [[package]]
name = "protobuf" name = "protobuf"
version = "3.7.2" version = "3.7.2"
@@ -6539,7 +6532,7 @@ dependencies = [
"flatbuffers", "flatbuffers",
"prost", "prost",
"prost-build", "prost-build",
"protobuf 3.7.2", "protobuf",
"tokio", "tokio",
"tonic 0.13.0", "tonic 0.13.0",
"tonic-build", "tonic-build",
@@ -6835,9 +6828,9 @@ dependencies = [
[[package]] [[package]]
name = "redox_syscall" name = "redox_syscall"
version = "0.5.10" version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1" checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3"
dependencies = [ dependencies = [
"bitflags 2.9.0", "bitflags 2.9.0",
] ]
@@ -7090,9 +7083,9 @@ dependencies = [
[[package]] [[package]]
name = "rust-embed" name = "rust-embed"
version = "8.6.0" version = "8.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b3aba5104622db5c9fc61098de54708feb732e7763d7faa2fa625899f00bf6f" checksum = "e5fbc0ee50fcb99af7cebb442e5df7b5b45e9460ffa3f8f549cd26b862bec49d"
dependencies = [ dependencies = [
"rust-embed-impl", "rust-embed-impl",
"rust-embed-utils", "rust-embed-utils",
@@ -7101,9 +7094,9 @@ dependencies = [
[[package]] [[package]]
name = "rust-embed-impl" name = "rust-embed-impl"
version = "8.6.0" version = "8.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f198c73be048d2c5aa8e12f7960ad08443e56fd39cc26336719fdb4ea0ebaae" checksum = "6bf418c9a2e3f6663ca38b8a7134cc2c2167c9d69688860e8961e3faa731702e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -7115,9 +7108,9 @@ dependencies = [
[[package]] [[package]]
name = "rust-embed-utils" name = "rust-embed-utils"
version = "8.6.0" version = "8.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a2fcdc9f40c8dc2922842ca9add611ad19f332227fc651d015881ad1552bd9a" checksum = "08d55b95147fe01265d06b3955db798bdaed52e60e2211c41137701b3aba8e21"
dependencies = [ dependencies = [
"sha2 0.10.8", "sha2 0.10.8",
"walkdir", "walkdir",
@@ -7299,7 +7292,7 @@ dependencies = [
"bitflags 2.9.0", "bitflags 2.9.0",
"errno", "errno",
"libc", "libc",
"linux-raw-sys 0.9.3", "linux-raw-sys 0.9.4",
"windows-sys 0.59.0", "windows-sys 0.59.0",
] ]
@@ -8509,7 +8502,7 @@ dependencies = [
"serde", "serde",
"serde_spanned", "serde_spanned",
"toml_datetime", "toml_datetime",
"winnow 0.7.4", "winnow 0.7.6",
] ]
[[package]] [[package]]
@@ -9767,9 +9760,9 @@ dependencies = [
[[package]] [[package]]
name = "winnow" name = "winnow"
version = "0.7.4" version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36" checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
@@ -9981,7 +9974,7 @@ dependencies = [
"tracing", "tracing",
"uds_windows", "uds_windows",
"windows-sys 0.59.0", "windows-sys 0.59.0",
"winnow 0.7.4", "winnow 0.7.6",
"xdg-home", "xdg-home",
"zbus_macros 5.5.0", "zbus_macros 5.5.0",
"zbus_names 4.2.0", "zbus_names 4.2.0",
@@ -10035,7 +10028,7 @@ checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97"
dependencies = [ dependencies = [
"serde", "serde",
"static_assertions", "static_assertions",
"winnow 0.7.4", "winnow 0.7.6",
"zvariant 5.4.0", "zvariant 5.4.0",
] ]
@@ -10181,7 +10174,7 @@ dependencies = [
"serde", "serde",
"static_assertions", "static_assertions",
"url", "url",
"winnow 0.7.4", "winnow 0.7.6",
"zvariant_derive 5.4.0", "zvariant_derive 5.4.0",
"zvariant_utils 3.2.0", "zvariant_utils 3.2.0",
] ]
@@ -10234,5 +10227,5 @@ dependencies = [
"serde", "serde",
"static_assertions", "static_assertions",
"syn 2.0.100", "syn 2.0.100",
"winnow 0.7.4", "winnow 0.7.6",
] ]
Cargo.toml
+23 -22
View File
@@ -34,18 +34,18 @@ all = "warn"
[workspace.dependencies] [workspace.dependencies]
madmin = { path = "./madmin" } madmin = { path = "./madmin" }
atoi = "2.0.0" atoi = "2.0.0"
async-recursion = "1.0.5" async-recursion = "1.1.1"
async-trait = "0.1.87" async-trait = "0.1.88"
atomic_enum = "0.3.0" atomic_enum = "0.3.0"
axum = "0.8.3" axum = "0.8.3"
axum-extra = "0.10.1" axum-extra = "0.10.1"
axum-server = { version = "0.7.2", features = ["tls-rustls"] } axum-server = { version = "0.7.2", features = ["tls-rustls"] }
backon = "1.3.0" backon = "1.5.0"
bytes = "1.9.0" bytes = "1.10.1"
bytesize = "1.3.0" bytesize = "1.3.3"
chrono = { version = "0.4.40", features = ["serde"] } chrono = { version = "0.4.40", features = ["serde"] }
clap = { version = "4.5.35", features = ["derive", "env"] } clap = { version = "4.5.35", features = ["derive", "env"] }
config = "0.15.9" config = "0.15.11"
datafusion = "46.0.0" datafusion = "46.0.0"
derive_builder = "0.20.2" derive_builder = "0.20.2"
dioxus = { version = "0.6.3", features = ["router"] } dioxus = { version = "0.6.3", features = ["router"] }
@@ -63,10 +63,11 @@ hyper-util = { version = "0.1.11", features = [
"server-auto", "server-auto",
"server-graceful", "server-graceful",
] } ] }
http = "1.2.0" http = "1.3.1"
http-body = "1.0.1" http-body = "1.0.1"
humantime = "2.1.0" humantime = "2.2.0"
keyring = { version = "3.6.1", features = ["apple-native", "windows-native", "sync-secret-service"] } jsonwebtoken = "9.3.1"
keyring = { version = "3.6.2", features = ["apple-native", "windows-native", "sync-secret-service"] }
lock = { path = "./common/lock" } lock = { path = "./common/lock" }
lazy_static = "1.5.0" lazy_static = "1.5.0"
libsystemd = { version = "0.7" } libsystemd = { version = "0.7" }
@@ -80,36 +81,36 @@ opentelemetry-appender-tracing = { version = "0.29.1", features = ["experimental
opentelemetry_sdk = { version = "0.29" } opentelemetry_sdk = { version = "0.29" }
opentelemetry-stdout = { version = "0.29.0" } opentelemetry-stdout = { version = "0.29.0" }
opentelemetry-otlp = { version = "0.29" } opentelemetry-otlp = { version = "0.29" }
opentelemetry-prometheus = { version = "0.29" } opentelemetry-prometheus = { version = "0.29.1" }
opentelemetry-semantic-conventions = { version = "0.29.0", features = ["semconv_experimental"] } opentelemetry-semantic-conventions = { version = "0.29.0", features = ["semconv_experimental"] }
pin-project-lite = "0.2" pin-project-lite = "0.2"
prometheus = "0.13.4" prometheus = "0.14.0"
# pin-utils = "0.1.0" # pin-utils = "0.1.0"
prost = "0.13.4" prost = "0.13.5"
prost-build = "0.13.4" prost-build = "0.13.5"
prost-types = "0.13.4" prost-types = "0.13.5"
protobuf = "3.7" protobuf = "3.7"
protos = { path = "./common/protos" } protos = { path = "./common/protos" }
rand = "0.8.5" rand = "0.8.5"
rdkafka = { version = "0.37", features = ["tokio"] } rdkafka = { version = "0.37", features = ["tokio"] }
reqwest = { version = "0.12.15", default-features = false, features = ["rustls-tls", "charset", "http2", "macos-system-configuration", "stream", "json", "blocking"] } reqwest = { version = "0.12.15", default-features = false, features = ["rustls-tls", "charset", "http2", "macos-system-configuration", "stream", "json", "blocking"] }
rfd = { version = "0.15.2", default-features = false, features = ["xdg-portal", "tokio"] } rfd = { version = "0.15.3", default-features = false, features = ["xdg-portal", "tokio"] }
rmp = "0.8.14" rmp = "0.8.14"
rmp-serde = "1.3.0" rmp-serde = "1.3.0"
rustfs-obs = { path = "crates/obs", version = "0.0.1" } rustfs-obs = { path = "crates/obs", version = "0.0.1" }
rust-embed = "8.6.0" rust-embed = "8.7.0"
rustls = { version = "0.23.26" } rustls = { version = "0.23.26" }
rustls-pki-types = "1.11.0" rustls-pki-types = "1.11.0"
rustls-pemfile = "2.2.0" rustls-pemfile = "2.2.0"
s3s = { git = "https://github.com/Nugine/s3s.git", rev = "3ad13ace7af703c3c8afc99cf19f4c18c82603a3" } s3s = { git = "https://github.com/Nugine/s3s.git", rev = "3ad13ace7af703c3c8afc99cf19f4c18c82603a3" }
s3s-policy = { git = "https://github.com/Nugine/s3s.git", rev = "3ad13ace7af703c3c8afc99cf19f4c18c82603a3" } s3s-policy = { git = "https://github.com/Nugine/s3s.git", rev = "3ad13ace7af703c3c8afc99cf19f4c18c82603a3" }
shadow-rs = { version = "0.38.0", default-features = false } shadow-rs = { version = "0.38.1", default-features = false }
serde = { version = "1.0.217", features = ["derive"] } serde = { version = "1.0.219", features = ["derive"] }
serde_json = "1.0.138" serde_json = "1.0.140"
serde_urlencoded = "0.7.1" serde_urlencoded = "0.7.1"
sha2 = "0.10.8" sha2 = "0.10.8"
snafu = "0.8.5" snafu = "0.8.5"
tempfile = "3.16.0" tempfile = "3.19.1"
test-case = "3.3.1" test-case = "3.3.1"
thiserror = "2.0.12" thiserror = "2.0.12"
time = { version = "0.3.41", features = [ time = { version = "0.3.41", features = [
@@ -124,7 +125,7 @@ tonic = { version = "0.13.0", features = ["gzip"] }
tonic-build = "0.13.0" tonic-build = "0.13.0"
tokio-rustls = { version = "0.26", default-features = false } tokio-rustls = { version = "0.26", default-features = false }
tokio-stream = "0.1.17" tokio-stream = "0.1.17"
tokio-util = { version = "0.7.13", features = ["io", "compat"] } tokio-util = { version = "0.7.14", features = ["io", "compat"] }
tower = { version = "0.5.2", features = ["timeout"] } tower = { version = "0.5.2", features = ["timeout"] }
tower-http = { version = "0.6.2", features = ["cors"] } tower-http = { version = "0.6.2", features = ["cors"] }
tracing = "0.1.41" tracing = "0.1.41"
@@ -135,7 +136,7 @@ tracing-appender = "0.2.3"
tracing-opentelemetry = "0.30" tracing-opentelemetry = "0.30"
transform-stream = "0.3.1" transform-stream = "0.3.1"
url = "2.5.4" url = "2.5.4"
uuid = { version = "1.15.1", features = [ uuid = { version = "1.16.0", features = [
"v4", "v4",
"fast-rng", "fast-rng",
"macro-diagnostics", "macro-diagnostics",
README.md
+38 -16
View File
@@ -1,31 +1,32 @@
# How to compile RustFS # How to compile RustFS
| Must package | Version | | Must package | Version | download link |
|--------------|---------| |--------------|---------|----------------------------------------------------------------------------------------------------------------------------------|
| Rust | 1.8.5 | | Rust | 1.8.5 | https://www.rust-lang.org/tools/install |
| protoc | 27.0 | | protoc | 30.2 | [protoc-30.2-linux-x86_64.zip](https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-x86_64.zip) |
| flatc | 24.0+ | | flatc | 24.0+ | [Linux.flatc.binary.g++-13.zip](https://github.com/google/flatbuffers/releases/download/v25.2.10/Linux.flatc.binary.g++-13.zip) |
Download Links: Download Links:
https://github.com/google/flatbuffers/releases/download/v24.3.25/Linux.flatc.binary.g++-13.zip https://github.com/google/flatbuffers/releases/download/v25.2.10/Linux.flatc.binary.g++-13.zip
https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protoc-27.0-linux-x86_64.zip https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-x86_64.zip
Or use Docker: Or use Docker:
```yml
- uses: arduino/setup-protoc@v3 - uses: arduino/setup-protoc@v3
with: with:
version: "27.0" version: "30.2"
- uses: Nugine/setup-flatc@v1 - uses: Nugine/setup-flatc@v1
with: with:
version: "24.3.25" version: "25.2.10"
```
# How to add Console web # How to add Console web
1. 1. `wget https://dl.rustfs.com/artifacts/console/rustfs-console-latest.zip`
wget [http://dl.rustfs.com/console/console.latest.tar.gz](https://dl.rustfs.com/artifacts/console/rustfs-console-latest.zip)
2. mkdir in this repos folder `./rustfs/static` 2. mkdir in this repos folder `./rustfs/static`
@@ -33,15 +34,34 @@ wget [http://dl.rustfs.com/console/console.latest.tar.gz](https://dl.rustfs.com/
# Star RustFS # Star RustFS
Add Env infomation: Add Env Information:
``` ```
export RUST_LOG="rustfs=debug,ecstore=debug,s3s=debug,iam=debug"
export RUSTFS_VOLUMES="./target/volume/test" export RUSTFS_VOLUMES="./target/volume/test"
export RUSTFS_ADDRESS="0.0.0.0:9000" export RUSTFS_ADDRESS="0.0.0.0:9000"
export RUSTFS_CONSOLE_ENABLE=true export RUSTFS_CONSOLE_ENABLE=true
export RUSTFS_CONSOLE_ADDRESS="0.0.0.0:9001" export RUSTFS_CONSOLE_ADDRESS="0.0.0.0:9001"
export RUSTFS_OBS_CONFIG="config/obs.toml" # 具体路径修改为配置文件真实路径，obs.example.toml 仅供参考 其中`RUSTFS_OBS_CONFIG` 和下面变量二选一
export RUSTFS_OBS_CONFIG="./deploy/config/obs.example.toml"
# 如下变量需要必须参数都有值才可以，以及会覆盖配置文件`obs.example.toml`中的值
export RUSTFS__OBSERVABILITY__ENDPOINT=http://localhost:4317
export RUSTFS__OBSERVABILITY__USE_STDOUT=true
export RUSTFS__OBSERVABILITY__SAMPLE_RATIO=2.0
export RUSTFS__OBSERVABILITY__METER_INTERVAL=30
export RUSTFS__OBSERVABILITY__SERVICE_NAME=rustfs
export RUSTFS__OBSERVABILITY__SERVICE_VERSION=0.1.0
export RUSTFS__OBSERVABILITY__ENVIRONMENT=develop
export RUSTFS__OBSERVABILITY__LOGGER_LEVEL=info
export RUSTFS__SINKS__FILE__ENABLED=true
export RUSTFS__SINKS__FILE__PATH="./deploy/logs/rustfs.log"
export RUSTFS__SINKS__WEBHOOK__ENABLED=false
export RUSTFS__SINKS__WEBHOOK__ENDPOINT=""
export RUSTFS__SINKS__WEBHOOK__AUTH_TOKEN=""
export RUSTFS__SINKS__KAFKA__ENABLED=false
export RUSTFS__SINKS__KAFKA__BOOTSTRAP_SERVERS=""
export RUSTFS__SINKS__KAFKA__TOPIC=""
export RUSTFS__LOGGER__QUEUE_CAPACITY=10
``` ```
You need replace your real data folder: You need replace your real data folder:
@@ -72,7 +92,7 @@ docker-compose -f docker-compose.yml up -d
## Create a new Observability configuration file ## Create a new Observability configuration file
#### 1. Enter the `config` directory, #### 1. Enter the `deploy/config` directory,
#### 2. Copy `obs.toml.example` to `obs.toml` #### 2. Copy `obs.toml.example` to `obs.toml`
@@ -84,7 +104,7 @@ docker-compose -f docker-compose.yml up -d
##### 3.3. Modify the `service_version` value to the version of the service ##### 3.3. Modify the `service_version` value to the version of the service
##### 3.4. Modify the `deployment_environment` value to the environment of the service ##### 3.4. Modify the `environment` value to the environment of the service
##### 3.5. Modify the `meter_interval` value to export interval ##### 3.5. Modify the `meter_interval` value to export interval
@@ -92,4 +112,6 @@ docker-compose -f docker-compose.yml up -d
##### 3.7. Modify the `use_stdout` value to export to stdout ##### 3.7. Modify the `use_stdout` value to export to stdout
##### 3.8. Modify the `logger_level` value to the logger level
crypto/Cargo.toml
+1 -1
View File
@@ -14,7 +14,7 @@ aes-gcm = { version = "0.10.3", features = ["std"], optional = true }
argon2 = { version = "0.5.3", features = ["std"], optional = true } argon2 = { version = "0.5.3", features = ["std"], optional = true }
cfg-if = "1.0.0" cfg-if = "1.0.0"
chacha20poly1305 = { version = "0.10.1", optional = true } chacha20poly1305 = { version = "0.10.1", optional = true }
jsonwebtoken = "9.3.0" jsonwebtoken = { workspace = true }
pbkdf2 = { version = "0.12.2", optional = true } pbkdf2 = { version = "0.12.2", optional = true }
rand = { workspace = true, optional = true } rand = { workspace = true, optional = true }
sha2 = { version = "0.10.8", optional = true } sha2 = { version = "0.10.8", optional = true }
deploy/build/rustfs-zh.service
+1
View File
@@ -47,6 +47,7 @@ ExecStart=/usr/local/bin/rustfs \
# --console-address 0.0.0.0:9002：控制台监听所有接口的 9002 端口。 # --console-address 0.0.0.0:9002：控制台监听所有接口的 9002 端口。
# 定义环境变量配置，用于传递给服务程序，推荐使用且简洁 # 定义环境变量配置，用于传递给服务程序，推荐使用且简洁
# rustfs 示例文件 详见: `../config/rustfs-zh.env`
EnvironmentFile=-/etc/default/rustfs EnvironmentFile=-/etc/default/rustfs
ExecStart=/usr/local/bin/rustfs $RUSTFS_VOLUMES $RUSTFS_OPTS ExecStart=/usr/local/bin/rustfs $RUSTFS_VOLUMES $RUSTFS_OPTS
deploy/build/rustfs.service
+1
View File
@@ -27,6 +27,7 @@ ExecStart=/usr/local/bin/rustfs \
--console-address 0.0.0.0:9002 --console-address 0.0.0.0:9002
# environment variable configuration (Option 2: Use environment variables) # environment variable configuration (Option 2: Use environment variables)
# rustfs example file see: `../config/rustfs.env`
EnvironmentFile=-/etc/default/rustfs EnvironmentFile=-/etc/default/rustfs
ExecStart=/usr/local/bin/rustfs $RUSTFS_VOLUMES $RUSTFS_OPTS ExecStart=/usr/local/bin/rustfs $RUSTFS_VOLUMES $RUSTFS_OPTS
deploy/config/.example.env
+1 -1
View File
@@ -20,7 +20,7 @@ SINKS__WEBHOOK__BATCH_SIZE=100
SINKS__WEBHOOK__BATCH_TIMEOUT_MS=1000 SINKS__WEBHOOK__BATCH_TIMEOUT_MS=1000
SINKS__FILE__ENABLED=true SINKS__FILE__ENABLED=true
SINKS__FILE__PATH=./deploy/logs/app.log SINKS__FILE__PATH=./deploy/logs/rustfs.log
SINKS__FILE__BATCH_SIZE=10 SINKS__FILE__BATCH_SIZE=10
SINKS__FILE__BATCH_TIMEOUT_MS=1000 SINKS__FILE__BATCH_TIMEOUT_MS=1000
deploy/config/obs-zh.example.toml
+1 -1
View File
@@ -25,7 +25,7 @@ batch_timeout_ms = 1000 # 批处理超时时间，单位为毫秒
[sinks.file] # 文件接收器配置 [sinks.file] # 文件接收器配置
enabled = true # 是否启用文件接收器 enabled = true # 是否启用文件接收器
path = "/Users/qun/Documents/rust/rustfs/s3-rustfs/logs/app.log" # 日志文件路径 path = "./deploy/logs/rustfs.log" # 日志文件路径
batch_size = 10 # 批处理大小 batch_size = 10 # 批处理大小
batch_timeout_ms = 1000 # 批处理超时时间，单位为毫秒 batch_timeout_ms = 1000 # 批处理超时时间，单位为毫秒
deploy/config/obs.example.toml
+1 -1
View File
@@ -25,7 +25,7 @@ batch_timeout_ms = 1000 # Default is 100ms if not specified
[sinks.file] [sinks.file]
enabled = true enabled = true
path = "./deploy/logs/app.log" path = "./deploy/logs/rustfs.log"
batch_size = 100 batch_size = 100
batch_timeout_ms = 1000 # Default is 8192 bytes if not specified batch_timeout_ms = 1000 # Default is 8192 bytes if not specified
ecstore/Cargo.toml
+2 -2
View File
@@ -32,7 +32,7 @@ s3s.workspace = true
http.workspace = true http.workspace = true
highway = "1.3.0" highway = "1.3.0"
url.workspace = true url.workspace = true
uuid = { version = "1.15.1", features = ["v4", "fast-rng", "serde"] } uuid = { workspace = true, features = ["v4", "fast-rng", "serde"] }
reed-solomon-erasure = { version = "6.0.0", features = ["simd-accel"] } reed-solomon-erasure = { version = "6.0.0", features = ["simd-accel"] }
transform-stream = "0.3.1" transform-stream = "0.3.1"
lazy_static.workspace = true lazy_static.workspace = true
@@ -44,7 +44,7 @@ path-absolutize = "3.1.1"
protos.workspace = true protos.workspace = true
rmp.workspace = true rmp.workspace = true
rmp-serde.workspace = true rmp-serde.workspace = true
tokio-util = { version = "0.7.13", features = ["io", "compat"] } tokio-util = { workspace = true, features = ["io", "compat"] }
crc32fast = "1.4.2" crc32fast = "1.4.2"
siphasher = "1.0.1" siphasher = "1.0.1"
base64-simd = "0.8.0" base64-simd = "0.8.0"
iam/Cargo.toml
+1 -1
View File
@@ -26,7 +26,7 @@ itertools = "0.14.0"
futures.workspace = true futures.workspace = true
rand.workspace = true rand.workspace = true
base64-simd = "0.8.0" base64-simd = "0.8.0"
jsonwebtoken = "9.3.0" jsonwebtoken = { workspace = true }
tracing.workspace = true tracing.workspace = true
madmin.workspace = true madmin.workspace = true
lazy_static.workspace = true lazy_static.workspace = true
policy/Cargo.toml
+1 -1
View File
@@ -24,7 +24,7 @@ itertools = "0.14.0"
futures.workspace = true futures.workspace = true
rand.workspace = true rand.workspace = true
base64-simd = "0.8.0" base64-simd = "0.8.0"
jsonwebtoken = "9.3.0" jsonwebtoken = { workspace = true }
tracing.workspace = true tracing.workspace = true
madmin.workspace = true madmin.workspace = true
lazy_static.workspace = true lazy_static.workspace = true
rustfs/Cargo.toml
+1 -1
View File
@@ -76,7 +76,7 @@ tonic = { workspace = true }
tower.workspace = true tower.workspace = true
transform-stream.workspace = true transform-stream.workspace = true
tower-http.workspace = true tower-http.workspace = true
uuid = "1.15.1" uuid = { workspace = true }
[target.'cfg(target_os = "linux")'.dependencies] [target.'cfg(target_os = "linux")'.dependencies]
libsystemd.workspace = true libsystemd.workspace = true
s3select/query/Cargo.toml
+2 -2
View File
@@ -10,8 +10,8 @@ async-trait.workspace = true
datafusion = { workspace = true } datafusion = { workspace = true }
derive_builder = { workspace = true } derive_builder = { workspace = true }
futures = { workspace = true } futures = { workspace = true }
parking_lot = { version = "0.12.1" } parking_lot = { version = "0.12.3" }
s3s.workspace = true s3s.workspace = true
snafu = { workspace = true, features = ["backtrace"] } snafu = { workspace = true, features = ["backtrace"] }
tokio = { workspace = true } tokio = { workspace = true }
tracing = { workspace = true } tracing = { workspace = true }
scripts/run.ps1
+1 -1
View File
@@ -40,7 +40,7 @@ $env:RUSTFS_CONSOLE_ENABLE = "true"
$env:RUSTFS_CONSOLE_ADDRESS = "127.0.0.1:9002" $env:RUSTFS_CONSOLE_ADDRESS = "127.0.0.1:9002"
# $env:RUSTFS_SERVER_DOMAINS = "localhost:9000" # $env:RUSTFS_SERVER_DOMAINS = "localhost:9000"
# Change to the actual configuration file path, obs.example.toml is for reference only # Change to the actual configuration file path, obs.example.toml is for reference only
$env:RUSTFS_OBS_CONFIG = ".\config\obs.example.toml" $env:RUSTFS_OBS_CONFIG = ".\deploy\config\obs.example.toml"
# Check command line arguments # Check command line arguments
if ($args.Count -gt 0) { if ($args.Count -gt 0) {
scripts/run.sh
+2 -2
View File
@@ -37,7 +37,7 @@ export RUSTFS_CONSOLE_ADDRESS="0.0.0.0:9002"
export RUSTFS_OBS_CONFIG="./deploy/config/obs.example.toml" export RUSTFS_OBS_CONFIG="./deploy/config/obs.example.toml"
# 如下变量需要必须参数都有值才可以，以及会覆盖配置文件中的值 # 如下变量需要必须参数都有值才可以，以及会覆盖配置文件中的值
export RUSTFS__OBSERVABILITY__ENDPOINT=http://localhost:43178 export RUSTFS__OBSERVABILITY__ENDPOINT=http://localhost:4317
export RUSTFS__OBSERVABILITY__USE_STDOUT=true export RUSTFS__OBSERVABILITY__USE_STDOUT=true
export RUSTFS__OBSERVABILITY__SAMPLE_RATIO=2.0 export RUSTFS__OBSERVABILITY__SAMPLE_RATIO=2.0
export RUSTFS__OBSERVABILITY__METER_INTERVAL=30 export RUSTFS__OBSERVABILITY__METER_INTERVAL=30
@@ -46,7 +46,7 @@ export RUSTFS__OBSERVABILITY__SERVICE_VERSION=0.1.0
export RUSTFS__OBSERVABILITY__ENVIRONMENT=develop export RUSTFS__OBSERVABILITY__ENVIRONMENT=develop
export RUSTFS__OBSERVABILITY__LOGGER_LEVEL=info export RUSTFS__OBSERVABILITY__LOGGER_LEVEL=info
export RUSTFS__SINKS__FILE__ENABLED=true export RUSTFS__SINKS__FILE__ENABLED=true
export RUSTFS__SINKS__FILE__PATH="./deploy/logs/app.log" export RUSTFS__SINKS__FILE__PATH="./deploy/logs/rustfs.log"
export RUSTFS__SINKS__WEBHOOK__ENABLED=false export RUSTFS__SINKS__WEBHOOK__ENABLED=false
export RUSTFS__SINKS__WEBHOOK__ENDPOINT="" export RUSTFS__SINKS__WEBHOOK__ENDPOINT=""
export RUSTFS__SINKS__WEBHOOK__AUTH_TOKEN="" export RUSTFS__SINKS__WEBHOOK__AUTH_TOKEN=""