audron/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Issues Pull requests Projects Releases Wiki Activity
819 commits 19 branches 0 tags 44 MiB
Commit graph

819 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Auvolat
d9d199a6c9
Merge branch 'main' into lx-perf-improvements 2022-09-08 15:49:17 +02:00
Alex
03c40a0b24 Merge pull request 'Reorganize dependencies' (#373) from improve-deps into main 
This PR includes work from @jirutka :

- [x] Allow linking against system-provided libraries (libsodium, libsqlite, libzstd) #370
- [x] Make OTLP exporter optional and allow building without Prometheus exporter (/metrics) #372

And also:

- [x] Update `.nix` files
- [x] Remove heed default-features
- [x] Bump versions of all Garage crates to 0.8.0
- [x] Make db engines (lmdb, sled, sqlite) optionnal
- [x] Add documentation for available features
- [x] Directly include code of previous versions used for migration in order to reduce dependencies
- [x] Read variable `GIT_VERSION` from garage main instead of in crate garage_util to make builds faster
- [x] Report features used in the build somewhere? (in `garage --version` or something)
- [x] Check we `warn!` correctly if we try to use deactivated feature
- [x] Allow not to launch S3 endpoint if not in config

Reviewed-on: Deuxfleurs/garage#373
 2022-09-08 15:45:09 +02:00
Alex Auvolat
ceb1f0229a
Move version back into util 2022-09-07 18:36:46 +02:00
Alex Auvolat
f310fce34b
Inject GIT_VERSION even later 2022-09-07 18:30:15 +02:00
Alex Auvolat
06df301de5
Fix merge 2022-09-07 18:16:01 +02:00
Alex Auvolat
8adc654713
Merge branch 'main' into improve-deps 2022-09-07 18:13:27 +02:00
Alex Auvolat
107853334b
Fix build error 2022-09-07 18:10:19 +02:00
Alex Auvolat
1449204439
Add warnings when features are not included in build 2022-09-07 18:02:13 +02:00
Alex Auvolat
2e00809af5
Error messages when system-libs XOR bundled-libs != 1 2022-09-07 17:57:12 +02:00
Alex Auvolat
2559f63e9b
Make all HTTP services optionnal 2022-09-07 17:54:16 +02:00
Alex Auvolat
28d86e7602
Report build features in garage --help 2022-09-07 17:05:21 +02:00
Alex Auvolat
db61f41030
Move GIT_VERSION injection later in build chain to reduce build times 2022-09-07 11:59:56 +02:00
Alex Auvolat
d23b3a14fc
Merge branch 'main' into lx-perf-improvements 2022-09-06 21:53:37 +02:00
Alex Auvolat
6f02c36a89
cargo fmt 2022-09-06 17:59:41 +02:00
Alex Auvolat
0f5689c169
Include code from v0.5.1 directly to remove dependencies 2022-09-06 17:52:50 +02:00
Alex Auvolat
1e92e9f782
Disable k2v tests when feature is disabled 2022-09-06 17:29:46 +02:00
Alex Auvolat
431dee050f
Remove opentelemetry-otlp dep in api/ 2022-09-06 17:25:44 +02:00
Alex Auvolat
2c2b93acdf
Update Nix files with optional db engines 2022-09-06 17:20:10 +02:00
Alex Auvolat
bbb970965c
Document available build features 2022-09-06 17:16:45 +02:00
Alex Auvolat
b886c75450
Make all DB engines optional build features 2022-09-06 17:09:43 +02:00
Alex Auvolat
48ffaaadfc
Bump versions to 0.8.0 (compatibility is broken already) 2022-09-06 16:47:56 +02:00
Alex Auvolat
7de53a4d66
Force disable pkg-config for libsodum-sys and libzstd-sys 2022-09-06 16:41:58 +02:00
Alex Auvolat
8d77a76df1
Update .nix files 2022-09-06 15:49:41 +02:00
Alex Auvolat
454d8474ef
Fix clippy 2022-09-06 15:43:50 +02:00
Alex
ed7796924b Merge pull request 'Make OTLP exporter optional and allow building without Prometheus exporter (/metrics)' (#372) from jirutka/garage:telemetry-and-metrics into improve-deps 
Reviewed-on: Deuxfleurs/garage#372
Reviewed-by: Alex <alex@adnab.me>
 2022-09-06 15:11:30 +02:00
Jakub Jirutka
ea36b9ff90 Allow building without Prometheus exporter (/metrics endpoint) 
prometheus and opentelemetry-prometheus add 7 extra dependencies in
total and increases the size of the garage binary by ~7 % (with
fat LTO).
 2022-09-06 01:15:09 +02:00
Jakub Jirutka
e7af006c1c 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).
 2022-09-06 01:14:47 +02:00
Jakub Jirutka
db72812f01 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
 2022-09-06 01:14:19 +02:00
Alex Auvolat
729a910e14
Remove Heed default features 2022-09-05 16:40:13 +02:00
Alex
9f5433db82 Merge pull request 'Update .drone.yml signature' (#374) from fix-drone-signature into main 
Reviewed-on: Deuxfleurs/garage#374
 2022-09-05 16:18:15 +02:00
Alex Auvolat
fd8074ad9b
Update .drone.yml signature 2022-09-05 16:09:01 +02:00
Alex Auvolat
07e6bcde85
Merge branch 'main' into lx-perf-improvements 2022-09-05 12:40:17 +02:00
Alex
0009fd136c Merge pull request 'Make block resync speed dynamically configurable' (#369) from resync-ajustable-speed into main 
Included in this PR:

- [x] Small refactor, resync code is moved to a separate `block/resync.rs` file
- [x] Block resync tranquility is no longer in config file, it is set dynamically using `garage worker set resync-tranquility` (this parameter is persisted over Garage restarts)
- [x] Up to 4 block resync workers can be activated to run simultaneously to speed up big resyncs, this parameter is set dynamically using `garage worker set resync-n-workers`

Reviewed-on: Deuxfleurs/garage#369
 2022-09-05 12:35:08 +02:00
Jakub Jirutka
7511ba5530 Allow linking against system-provided libsqlite 
Unfortunately, rusqlite uses the opposite logic for enabling/disabling
bundled libraries to others (libsodium-sys, zstd-sys). Cargo features
are very limited and doesn't allow to enable feature A in a dependency
iff feature B is disabled.

Note, lmdb-rkv-sys doesn't need any special treatment because it
automatically links against system liblmdb if found via pkgconf.

Linux distros should build garage with
`--no-default-features --features system-libs` to disable bundled-libs
and enable system-libs.
 2022-09-03 19:15:57 +02:00
Jakub Jirutka
a6e40b75ea Add feature "system-libs" to enable linking against system libraries 
If this feature is enabled, libsodium-sys and zstd-sys will link
dynamically against system-provided libraries instead of building
and linking statically the bundled (possibly outdated and vulnerable)
copies of them. This feature is intended mainly for linux package
maintainers.
 2022-09-03 18:44:34 +02:00
Alex Auvolat
e1751c8a9c
fix clippy 2022-09-02 17:24:26 +02:00
Alex Auvolat
5d4b937a00
Ability to have up to 4 concurrently working resync workers 2022-09-02 17:18:13 +02:00
Alex Auvolat
5e8baa433d
Make BlockManagerLocked fully private again 2022-09-02 16:52:22 +02:00
Alex Auvolat
47be652a1f
block manager: refactor: split resync into separate file 2022-09-02 16:47:15 +02:00
Alex Auvolat
943d76c583
Ability to dynamically set resync tranquility 2022-09-02 15:34:21 +02:00
Alex Auvolat
6226f5ceca
Update to netapp 0.4.5 - fixed ping 2022-09-02 14:33:12 +02:00
Alex Auvolat
eb97e13a6a
update cargo.nix 2022-08-31 17:42:00 +02:00
Alex Auvolat
efbca67ce4
Add env filter to tracing subscriber 2022-08-31 14:39:12 +02:00
Alex Auvolat
44cd98d2e4
Tracing-subscriber: write to stderr 2022-08-31 14:28:17 +02:00
Alex Auvolat
dd5304f6fc
Replace logging crate pretty_env_logger by tracing_subscriber::fmt 2022-08-31 14:24:41 +02:00
Alex Auvolat
4da67b0035
Update drone signature 2022-08-29 16:48:31 +02:00
Alex Auvolat
ebc20a8798
Merge branch 'main' into lx-perf-improvements 2022-08-29 16:44:13 +02:00
Quentin Dufour
532eca7ff9
Add some documentation for Caddy 2022-08-12 10:33:41 +02:00
Quentin Dufour
2c7bae935a
Configure structopt to report the right version 
By default, structopt reports the value provided by
the env var CARGO_PKG_VERSION, feeded by Cargo when reading
Cargo.toml. However for Garage we use a versioning based on git,
so we often report a version that is behind the real version.
In this commit, we create garage_util::version::garage() that
reports the right version and configure all structopt subcommands
to call this function instead of using the env var.
 2022-08-11 10:21:45 +02:00
Quentin Dufour
8cd02639dc
drone: set TARGET env as needed by "to_s3" func 2022-08-03 11:19:26 +02:00