mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 13:27:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

community/garage: upgrade to 0.8.2

Browse Source
This commit is contained in:
Jakub Jirutka 2023-05-07 01:34:13 +02:00
parent bb53e69c7c
commit fa73544429
11 changed files with 223 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
community/garage/0001-Use-the-new-cargo-feature-resolver-2.patch
View File

@ -1,32 +0,0 @@
Patch-Source: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/372
--
From fd215ed3e5de20abae4d8535e99b07d76784cfc7 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sun, 4 Sep 2022 15:26:19 +0200
Subject: [PATCH 1/3] Use the new cargo feature resolver "2"
Garage currently uses the legacy resolver "1". The new one is used
by default if the root package specifies 'edition = 2021', which
Garage does not (yet).
The problem with the legacy resolver is, among others, that features
enabled by dev-dependencies are propagated to normal dependencies.
This affects e.g. hyper - one of the dev-dependencies enables "http2"
feature that adds many extra dependencies. If we build garage without
opentelemetry-otlp (this is enabled in the following commit), there's
no normal dependency enabling "http2" feature.
See https://doc.rust-lang.org/cargo/reference/resolver.html#feature-resolver-version-2
---
Cargo.toml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Cargo.toml b/Cargo.toml
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,5 @@
[workspace]
+resolver = "2"
members = [
"src/util",
"src/rpc",

81
community/garage/0002-Make-OTLP-exporter-optional-via-feature-telemetry-ot.patch
View File

@ -1,81 +0,0 @@
Patch-Source: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/372
--
From d7a3de8a7b20723c1aba3949f7781d33a79ad943 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sat, 3 Sep 2022 23:40:44 +0200
Subject: [PATCH 2/3] Make OTLP exporter optional via feature "telemetry-otlp"
opentelemetry-otlp add 48 (!) extra dependencies and increases the
size of the garage binary by ~11 % (with fat LTO).
diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml
--- a/src/api/Cargo.toml
+++ b/src/api/Cargo.toml
@@ -55,8 +55,9 @@
opentelemetry = "0.17"
opentelemetry-prometheus = "0.10"
-opentelemetry-otlp = "0.10"
+opentelemetry-otlp = { version = "0.10", optional = true }
prometheus = "0.13"
[features]
k2v = [ "garage_util/k2v", "garage_model/k2v" ]
+telemetry-otlp = ["opentelemetry-otlp"]
diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml
--- a/src/garage/Cargo.toml
+++ b/src/garage/Cargo.toml
@@ -54,7 +54,7 @@
opentelemetry = { version = "0.17", features = [ "rt-tokio" ] }
opentelemetry-prometheus = "0.10"
-opentelemetry-otlp = "0.10"
+opentelemetry-otlp = { version = "0.10", optional = true }
prometheus = "0.13"
[dev-dependencies]
@@ -74,3 +74,5 @@
[features]
kubernetes-discovery = [ "garage_rpc/kubernetes-discovery" ]
k2v = [ "garage_util/k2v", "garage_api/k2v" ]
+# Exporter for the OpenTelemetry Collector.
+telemetry-otlp = [ "opentelemetry-otlp", "garage_api/telemetry-otlp" ]
diff --git a/src/garage/main.rs b/src/garage/main.rs
--- a/src/garage/main.rs
+++ b/src/garage/main.rs
@@ -8,6 +8,7 @@
mod cli;
mod repair;
mod server;
+#[cfg(feature = "telemetry-otlp")]
mod tracing_setup;
use std::net::SocketAddr;
diff --git a/src/garage/server.rs b/src/garage/server.rs
--- a/src/garage/server.rs
+++ b/src/garage/server.rs
@@ -15,6 +15,7 @@
use garage_api::k2v::api_server::K2VApiServer;
use crate::admin::*;
+#[cfg(feature = "telemetry-otlp")]
use crate::tracing_setup::*;
async fn wait_from(mut chan: watch::Receiver<bool>) {
@@ -46,9 +47,15 @@
info!("Initializing Garage main data store...");
let garage = Garage::new(config.clone(), db, background);
- info!("Initialize tracing...");
+ #[cfg(feature = "telemetry-otlp")]
if let Some(export_to) = config.admin.trace_sink {
+ info!("Initialize tracing...");
+
+ #[cfg(feature = "telemetry-otlp")]
init_tracing(&export_to, garage.system.id)?;
+
+ #[cfg(not(feature = "telemetry-otlp"))]
+ warn!("Garage was built without OTLP exporter, admin.trace_sink is ignored.");
}
info!("Initialize Admin API server and metrics collector...");

37
community/garage/APKBUILD
View File

@ -1,8 +1,8 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=garage
pkgver=0.7.3
pkgrel=3
pkgver=0.8.2
pkgrel=0
pkgdesc="Lightweight S3-compatible distributed object store"
url="https://garagehq.deuxfleurs.fr"
# ppc64le, s390x: fails to build ring crate
@ -21,39 +21,32 @@ pkggroups="garage"
install="$pkgname.pre-install"
subpackages="$pkgname-openrc"
source="https://github.com/deuxfleurs-org/garage/archive/v$pkgver/garage-$pkgver.tar.gz
0001-Use-the-new-cargo-feature-resolver-2.patch
0002-Make-OTLP-exporter-optional-via-feature-telemetry-ot.patch
use-system-zstd.patch
fix-website-test-k2v.patch
syslog-support.patch
garage.toml
$pkgname.initd
$pkgname.confd
"
export CARGO_PROFILE_RELEASE_DEBUG="false"
_cargo_opts="--frozen --no-default-features --features system-libs,sled"
export CARGO_PROFILE_RELEASE_OPT_LEVEL=2
export SODIUM_USE_PKG_CONFIG=1
export GIT_VERSION="v$pkgver" # version used in --version
prepare() {
cargo fetch --target="$CTARGET" --locked
default_prepare
# Don't run k2v tests; k2v is still experimental and not built by
# default.
sed -i '/mod k2v/d' src/garage/tests/lib.rs
cargo fetch --target="$CTARGET" # update after patching Cargo.toml
cargo fetch --target="$CTARGET" --locked
}
build() {
cargo build --frozen --release
cargo build $_cargo_opts --release
}
check() {
cargo test --workspace --frozen
cargo test $_cargo_opts --workspace
}
package() {
@ -67,12 +60,10 @@ package() {
}
sha512sums="
47f49fab66f5e5bb0bbbffcebc5157727baf155a4be581959213d9521d48bb422af2afd6477e2e0fa41958319a300f884d35a6f0f05dbd54aea135f0f0341c2d garage-0.7.3.tar.gz
6d46032eeef7d12d2735e8d79cc9b27e7eaa399452ed8c12f6469b1d49af8691fe3a06c4d5b38e4122ba62a4a341ce4a59d4d67fcceb9340bb285df00b04b9f2 0001-Use-the-new-cargo-feature-resolver-2.patch
d670b4068ffd62d8e3ae364861f7b9a78d0ea43ed88d538325e6b595bc3129f739f7f789a3a9e9deb08a4a874387869e400f7b2185b1a7bdfa02d138beb05ac9 0002-Make-OTLP-exporter-optional-via-feature-telemetry-ot.patch
0b1802c3e8964b61fd3f41ee15aa2631c1fcf90d6105ae4c5184c740ce11dd6ed956b1b613b882494e9437077e5bd006f55c643a87dfb89cfdf0ddf58ca28243 use-system-zstd.patch
fbd0551c2f23f96001b757a6ae052c4938e7a071337ea638f8709c1fd5441b1d076ba50b37058ddaacf24051d569e3b5e3cb782bfe90263bcb1c2ace0aef4e5c syslog-support.patch
c0717e2737750306e2acdd159f09cb1a83de7ec23b7229711bace6b033e04b5ffd8afea2e98d035eac887d0bfbb8468e4d2f7c07a2275612975f83c42608629a garage.toml
2acd394ca5dca53f5e69972e60264419bdbd4d8d52c90c95b3e4c8a618afab770e59a3b623b4bbb6fc078bba5cac72fb50d0aa3d17c9a5fe6615c66578b7bdfb garage.initd
3cdbcb1c865e988fe0ccf4a5a0edf9550840bf9bb0f9f1e4f6102aba4343b8ea8630a2282d69eb9414a46fa843a847a3dd1b48997ca0ea865290f8652b97a0fa garage.confd
b2279fb55d4c694d4dff155c123c3c3e7fda8d04676a10ef9b572b199c873bdb79397fb686c3236f90be92f2bc1aef36f845ec40b38def9593f86d0fac687c21 garage-0.8.2.tar.gz
d5ab54a95e1376988e72dc7c9c2565a381de5ae771de72e8f60e3b331f8e8ab951a2778199215b55b90f93e00634addbf19c843882def51b0a0e07ac5d7e6779 fix-website-test-k2v.patch
e59399ab8a16b591498be0d6510054adf14ff5c4ec15ddfdf69b046119fa036c8abef10173aa29f832ff64d1b0c46b51d17051a450d85b61bd99eb91b8c64ed5 syslog-support.patch
f5441fa18d80b5ce91dfdf692552bd66615f057ea9adbbf83535a58b3c5d2fcf6bca7486c0ccf8644d8ed9c3ff1228a72eee7da4dc0c62ced999492d419323e5 garage.toml
a2130fa81ed2c8af266ed1e86d0c72e3aae6995599347e4488c6cd4cc83217fbb65ea9121415985f8cdcd15aaee9b28886b1ccf24755571b3ddf2fc5d8dd5b3a garage.initd
f31bb5bde3ff41dc5fa6832c8ff24e1f1027b34513ab5e5c008df13495b53a569d3cb5adefed93cf780f5e488ff760603097785d85e1a884538e802e415205bd garage.confd
"

25
community/garage/fix-website-test-k2v.patch Normal file
View File

@ -0,0 +1,25 @@
Patch-Source: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/556
--
From 6468535a96a853179b4a7211488fb4ae29d8fae5 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sun, 30 Apr 2023 01:01:56 +0200
Subject: [PATCH] Include s3/website test only when k2v is enabled
It depends on k2v feature, so fails to build when k2v is disabled.
---
src/garage/tests/s3/mod.rs | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/garage/tests/s3/mod.rs b/src/garage/tests/s3/mod.rs
index 623eb66..e47110f 100644
--- a/src/garage/tests/s3/mod.rs
+++ b/src/garage/tests/s3/mod.rs
@@ -3,4 +3,5 @@ mod multipart;
mod objects;
mod simple;
mod streaming_signature;
+#[cfg(feature = "k2v")]
mod website;
--
2.38.4

4
community/garage/garage.confd
View File

@ -7,7 +7,9 @@
# set this to "no" and declare 'error_log=/var/log/garage.log'.
#log_syslog=yes
# The log level for logging into syslog.
# The logging level for the garage and netapp modules; one of: "error", "warn",
# "info", "debug" or "trace". For finer adjustments, set variable RUST_LOG
# (see https://docs.rs/env_logger/latest/env_logger/#enabling-logging).
#log_level="warn"
# User (and group) to run garage as.

4
community/garage/garage.initd
View File

@ -24,9 +24,11 @@ depend() {
}
start_pre() {
export RUST_LOG=${RUST_LOG:-"netapp=$log_level,garage=$log_level"}
# NOTE: Logging to syslog is not supported by upstream (yet), this is
# done by Alpine's patch for now.
yesno "$log_syslog" && export SYSLOG_LEVEL="$log_level"
yesno "$log_syslog" && export GARAGE_SYSLOG=1
if ! [ -f "$cfgfile.apk-new" ] && grep -qFx "$_rpc_secret_placeholder" "$cfgfile"; then
if [ -w "$cfgfile" ]; then

5
community/garage/garage.toml
View File

@ -14,6 +14,9 @@ metadata_dir = "/var/lib/garage/meta"
# The directory in which Garage will store the data blocks of objects.
data_dir = "/var/lib/garage/data"
# The block size for stored objects.
#block_size = 1048576
# Refer to the reference manual.
replication_mode = "none"
@ -72,3 +75,5 @@ root_domain = ""
# The token for accessing the Metrics endpoint. If not set, the Metrics
# endpoint can be accessed without access control!
#metrics_token = ""
# or read it from the file.
#metrics_token_file = ""

96
community/garage/syslog-support.patch
View File

@ -1,35 +1,89 @@
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Thu, 01 Sep 2022 22:53:38 +0200
Subject: [PATCH] Add support for logging into syslog
Date: Sun, 07 May 2023 00:08:59 +0200
Subject: [PATCH] Add support for logging into syslog and don't output
ANSI sequences (colours)
This is more a quick&dirty approach, not meant to be upstreamed as-is.
--- a/src/garage/main.rs
+++ b/src/garage/main.rs
@@ -59,7 +59,19 @@
if std::env::var("RUST_LOG").is_err() {
std::env::set_var("RUST_LOG", "netapp=info,garage=info")
@@ -156,10 +156,36 @@
};
std::env::set_var("RUST_LOG", default_log)
}
- pretty_env_logger::init();
- tracing_subscriber::fmt()
- .with_writer(std::io::stderr)
- .with_env_filter(tracing_subscriber::filter::EnvFilter::from_default_env())
- .init();
+
+ // XXX-Patched
+ if let Ok(syslog_level) = std::env::var("SYSLOG_LEVEL") {
+ let level = syslog_level
+ .parse()
+ .expect(&format!("SYSLOG_LEVEL={} is not a valid syslog level", syslog_level));
+ syslog::init_unix(syslog::Facility::LOG_DAEMON, level)
+ .expect("Failed to connect to syslog");
+ eprintln!("Logging to syslog");
+ } else {
+ pretty_env_logger::init();
+ }
+ let env_filter = tracing_subscriber::filter::EnvFilter::from_default_env();
+
+ if std::env::var("GARAGE_SYSLOG").is_ok() {
+ use std::ffi::CStr;
+ use syslog_tracing::{Facility, Options, Syslog};
+
+ let syslog = Syslog::new(
+ CStr::from_bytes_with_nul(b"garage\0").unwrap(),
+ Options::LOG_PID | Options::LOG_PERROR,
+ Facility::Daemon,
+ ).expect("Unable to init syslog");
+
+ tracing_subscriber::fmt()
+ .with_writer(syslog)
+ .with_env_filter(env_filter)
+ .with_ansi(false) // disable ANSI escape sequences (colours)
+ .with_file(false)
+ .with_level(false)
+ .without_time()
+ .compact()
+ .init();
+ } else {
+ tracing_subscriber::fmt()
+ .with_writer(std::io::stderr)
+ .with_env_filter(env_filter)
+ .with_ansi(false) // disable ANSI escape sequences (colours)
+ .init();
+ }
+
sodiumoxide::init().expect("Unable to init sodiumoxide");
let opt = Opt::from_args();
let res = match opt.cmd {
--- a/src/garage/Cargo.toml
+++ b/src/garage/Cargo.toml
@@ -37,2 +37,3 @@
sodiumoxide = { version = "0.2.5-0", package = "kuska-sodiumoxide" }
+syslog = "6.0"
@@ -58,6 +58,8 @@
opentelemetry-otlp = { version = "0.10", optional = true }
prometheus = { version = "0.13", optional = true }
+syslog-tracing = "0.1.0"
+
[dev-dependencies]
aws-sdk-s3 = "0.19"
chrono = "0.4"
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1113,6 +1113,7 @@
"sha2 0.10.6",
"static_init",
"structopt",
+ "syslog-tracing",
"timeago",
"tokio",
"toml",
@@ -3559,6 +3560,17 @@
"quote",
"syn",
"unicode-xid",
+]
+
+[[package]]
+name = "syslog-tracing"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cf9ff1f9f8e5ba220a58bbccb0375f4cabd785f96a8683b31389cefd91be747"
+dependencies = [
+ "libc",
+ "tracing-core",
+ "tracing-subscriber",
]
[[package]]

98
community/garage/timeago-features.patch Normal file
View File

@ -0,0 +1,98 @@
Patch-Source: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/559
--
From e927fe8aab81bdfe9725432e3868b7dac97cfb25 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sun, 7 May 2023 00:51:31 +0200
Subject: [PATCH] Remove unnecessary/unused "timeago" features
To decrease dependency bloat and binary size.
---
Cargo.lock | 37 -------------------------------------
src/garage/Cargo.toml | 2 +-
2 files changed, 1 insertion(+), 38 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 89d2574..684a9b7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1757,15 +1757,6 @@ dependencies = [
"windows-sys",
]
-[[package]]
-name = "isolang"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b64fd6448ee8a45ce6e4365c58e4fa7d8740cba2ed70db3e9ab4879ebd93eaaa"
-dependencies = [
- "phf",
-]
-
[[package]]
name = "itertools"
version = "0.4.19"
@@ -2546,24 +2537,6 @@ dependencies = [
"indexmap",
]
-[[package]]
-name = "phf"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
-dependencies = [
- "phf_shared",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
-dependencies = [
- "siphasher",
-]
-
[[package]]
name = "pin-project"
version = "1.0.12"
@@ -3406,12 +3379,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "siphasher"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
-
[[package]]
name = "slab"
version = "0.4.7"
@@ -3678,10 +3645,6 @@ name = "timeago"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5082dc942361cdfb74eab98bf995762d6015e5bb3a20bf7c5c71213778b4fcb4"
-dependencies = [
- "chrono",
- "isolang",
-]
[[package]]
name = "tinyvec"
diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml
index 0cbdf89..c8f8756 100644
--- a/src/garage/Cargo.toml
+++ b/src/garage/Cargo.toml
@@ -33,7 +33,7 @@ garage_web = { version = "0.8.2", path = "../web" }
backtrace = "0.3"
bytes = "1.0"
bytesize = "1.1"
-timeago = "0.4"
+timeago = { version = "0.4", default-features = false }
parse_duration = "2.1"
hex = "0.4"
tracing = { version = "0.1" }
--
2.40.1

19
community/garage/uncolor-log-output.patch
View File

@ -1,19 +0,0 @@
ANSI escape sequences are not very convenient in log files...
env_logger allows to disable them via env. variable and also prints timestamp.
--- a/src/garage/main.rs
+++ b/src/garage/main.rs
@@ -59,7 +59,7 @@
if std::env::var("RUST_LOG").is_err() {
std::env::set_var("RUST_LOG", "netapp=info,garage=info")
}
- pretty_env_logger::init();
+ env_logger::init();
sodiumoxide::init().expect("Unable to init sodiumoxide");
let opt = Opt::from_args();
--- a/src/garage/Cargo.toml
+++ b/src/garage/Cargo.toml
@@ -34,1 +34,1 @@
-pretty_env_logger = "0.4"
+env_logger = "0.8"

10
community/garage/use-system-zstd.patch
View File

@ -1,10 +0,0 @@
--- a/src/block/Cargo.toml
+++ b/src/block/Cargo.toml
@@ -28 +28 @@
-zstd = { version = "0.9", default-features = false }
+zstd = { version = "0.9", default-features = false, features = ["pkg-config"] }
--- a/src/model/Cargo.toml
+++ b/src/model/Cargo.toml
@@ -31 +31 @@
-zstd = { version = "0.9", default-features = false }
+zstd = { version = "0.9", default-features = false, features = ["pkg-config"] }