rpc/system_metrics.rs: Added rustversion label to garage_build_info metric. #524

Merged
lx merged 5 commits from jpds/garage:rustversion-label into main 2023-03-13 15:46:49 +00:00
Contributor
No description provided.
jpds force-pushed rustversion-label from 25e90d2bf9 to 531cd017ab 2023-03-10 11:48:40 +00:00 Compare
Owner

Hi @jpds, thanks for your PR, can you elaborate a bit more around the use cases you see for it?

Hi @jpds, thanks for your PR, can you elaborate a bit more around the use cases you see for it?
Author
Contributor

@quentin Knowing when to rebuild all the Rust binaries because of a vulnerability at the compiler level.

@quentin Knowing when to rebuild all the Rust binaries because of a vulnerability at the compiler level.
Owner

Makes sense. Before accepting it, I want to be sure that it does not break our NixOS-based build system, as you introduce a build.rs file. Otherwise, looks good to me.

Makes sense. Before accepting it, I want to be sure that it does not break our NixOS-based build system, as you introduce a build.rs file. Otherwise, looks good to me.
Author
Contributor

Someone will need to push up a Cargo.nix change for the new package (which is why I allowed edits from maintainers) - but I think it should work fine after that.

Someone will need to push up a `Cargo.nix` change for the new package (which is why I allowed edits from maintainers) - but I think it should work fine after that.
lx requested changes 2023-03-10 14:05:08 +00:00
src/rpc/build.rs Outdated
@ -0,0 +1,8 @@
use rustc_version::version;
fn main() {
Owner

Can we move this to the garage_util crate, and make the rustc version available in the version module (as garage_util::version::rustc_version(), similarly to garage_util::version::garage_version())

This way we can also show the rustc version in garage stats (here) and in the status admin endpoint (here)

Can we move this to the `garage_util` crate, and make the rustc version available in the `version` module (as `garage_util::version::rustc_version()`, similarly to `garage_util::version::garage_version()`) This way we can also show the rustc version in `garage stats` ([here](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/main/src/garage/admin.rs#L821)) and in the status admin endpoint ([here](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/main/src/api/admin/cluster.rs#L21))
Owner

I can regen the cargo.nix file once the dependency on rustc_version is moved to the correct crate

I can regen the cargo.nix file once the dependency on rustc_version is moved to the correct crate
jpds marked this conversation as resolved
jpds force-pushed rustversion-label from 531cd017ab to 9ea154ae9c 2023-03-10 14:47:23 +00:00 Compare
lx added 1 commit 2023-03-10 17:15:17 +00:00
update cargo.nix
All checks were successful
continuous-integration/drone/pr Build is passing
40fa1242f0
Owner

I restarted the CI for the last commit.

It failed on thread 'k2v::poll::test_poll_range' panicked at 'Command exited with code 1: Could not get node ID', tests/common/ext/process.rs:46:31. Running the tests (with nix-build) on my computer worked. I suspect a race condition (we statically wait for only 2sec at garage startup).

I think I will open a separate PR to fix this issue, and the other one with the parallel tests. In the mean time, we should restart the CI and/or increase the duration in the fn setup() sleep, inside the src/garage/tests/common/garage.rs file.

I restarted the CI for the last commit. It failed on `thread 'k2v::poll::test_poll_range' panicked at 'Command exited with code 1: Could not get node ID', tests/common/ext/process.rs:46:31`. Running the tests (with nix-build) on my computer worked. I suspect a race condition (we statically wait for only 2sec at garage startup). I think I will open a separate PR to fix this issue, and the other one with the parallel tests. In the mean time, we should restart the CI and/or increase the duration in the `fn setup()` sleep, inside the `src/garage/tests/common/garage.rs` file.
lx added 1 commit 2023-03-13 15:14:19 +00:00
Merge branch 'main' into rustversion-label
All checks were successful
continuous-integration/drone/pr Build is passing
f37ec584b6
lx merged commit 7fcc153e7c into main 2023-03-13 15:46:49 +00:00
Sign in to join this conversation.
No reviewers
lx
No milestone
No project
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Deuxfleurs/garage#524
No description provided.