Deuxfleurs/garage
44
56
Fork 74
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

Updates dependencies for possible 1.1 release #847

Open
maximilien wants to merge 1 commit from update-dependencies-1.1 into main
pull from: update-dependencies-1.1
merge into: Deuxfleurs:main
Conversation 2 Commits 1 Files changed 5 +2198 -2069
maximilien commented 2024-08-06 21:44:06 +00:00
Owner
Copy link

Just a simple dependency file updates, with a warning fix.

Just a simple dependency file updates, with a warning fix.
maximilien added this to the v1.1 milestone 2024-08-06 21:44:06 +00:00
maximilien added the
kind
improvement
 label 2024-08-06 21:44:06 +00:00
maximilien added the
scope
build
 label 2024-08-07 22:04:03 +00:00
maximilien force-pushed update-dependencies-1.1 from efa755a79f to 4d8df6856f 2024-08-08 06:41:03 +00:00 Compare
lx requested changes 2024-08-24 11:15:00 +00:00
src/model/s3/lifecycle_worker.rs Outdated
@ -397,3 +398,1 @@
.date()
.succ_opt()
.expect("no next day")
.date_naive()
lx commented 2024-08-24 11:14:57 +00:00
Owner
Copy link

By removing .succ_opt(), you are changing the meaning of this function! It is supposed to return the date of the day following the day of the given timestamp, not just the day of the timestamp.

By removing `.succ_opt()`, you are changing the meaning of this function! It is supposed to return the date of the day following the day of the given timestamp, not just the day of the timestamp.
lx marked this conversation as resolved
lx commented 2024-08-25 08:28:57 +00:00
Owner
Copy link

Ok, so this escalated quickly. We are deadlocked, because:

  • The updated aws-sdk-config crate requires rustc >= 1.77.0 and we are building with 1.73.0

  • The updates to the flake.nix file that import a newer version of cargo2nix and a new compiler cause a build error of the kind error: executing shell '/bin/bash': Argument list too long. I'm not sure where this comes from, but until we are able to fix it, we cannot update the compiler version to 1.80 as I tried doing.

I think trying to update the Nix dependencies (and the Rust toolchain) at the same time we updated Cargo dependencies was a bad move. Updating the toolchain is always hard, but we don't need to do it for the moment.

My suggestion is to:

  • restart from the main branch
  • avoid changing any .nix files (don't update cargo2nix, nixpkgs or rust-overlay)
  • only update Rust dependencies in the Cargo.lock file
  • select which rust dependencies to update, e.g. we can exclude aws-sdk-config if it prevents building with the current 1.73 toolchain, it is not a critical dependency, it's not even part of Garage itself, it's only used for testing
Ok, so this escalated quickly. We are deadlocked, because: - The updated `aws-sdk-config` crate [requires rustc >= 1.77.0 and we are building with 1.73.0](https://woodpecker.deuxfleurs.fr/repos/1/pipeline/1212/5) - The updates to the flake.nix file that import a newer version of cargo2nix and a new compiler cause a [build error](https://woodpecker.deuxfleurs.fr/repos/1/pipeline/1235/3) of the kind `error: executing shell '/bin/bash': Argument list too long`. I'm not sure where this comes from, but until we are able to fix it, we cannot update the compiler version to 1.80 as I tried doing. I think trying to update the Nix dependencies (and the Rust toolchain) at the same time we updated Cargo dependencies was a bad move. Updating the toolchain is always hard, but we don't need to do it for the moment. My suggestion is to: - restart from the main branch - avoid changing any .nix files (don't update cargo2nix, nixpkgs or rust-overlay) - only update Rust dependencies in the Cargo.lock file - select which rust dependencies to update, e.g. we can exclude `aws-sdk-config` if it prevents building with the current 1.73 toolchain, it is not a critical dependency, it's not even part of Garage itself, it's only used for testing
lx force-pushed update-dependencies-1.1 from 7abf1f5833 to f3589fee77 2024-08-25 09:28:51 +00:00 Compare
lx commented 2024-08-25 09:58:44 +00:00
Owner
Copy link

Should fix #849

We are leaving the following for future PRs:

  • move back to cargo2nix upstream (this might break stuff)

  • update nixpkgs in flake.nix

  • update rust-overlay in flake.nix and update rust to 1.80 in nix/compile.nix (this might break stuff)

  • maybe: remove the obsolete clippy driver (it doesn't work)

  • eventually, allow upgrading the aws-* depenencies

Each of these things should be done independently in different PRs to avoid breaking stuff, we can probably do these steps one after another and keep a working CI build at every step.

Should fix #849 We are leaving the following for future PRs: - move back to cargo2nix upstream (this might break stuff) - update nixpkgs in flake.nix - update rust-overlay in flake.nix and update rust to 1.80 in nix/compile.nix (this might break stuff) - maybe: remove the obsolete clippy driver (it doesn't work) - eventually, allow upgrading the aws-* depenencies Each of these things should be done independently in different PRs to avoid breaking stuff, we can probably do these steps one after another and keep a working CI build at every step.
lx force-pushed update-dependencies-1.1 from 5432818ad1 to f3589fee77 2024-08-25 18:08:18 +00:00 Compare
Some checks failed
ci/woodpecker/push/debug Pipeline failed
Details
ci/woodpecker/pr/debug Pipeline failed
Required
Details
This pull request has changes conflicting with the target branch.
  • Cargo.nix
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin update-dependencies-1.1:update-dependencies-1.1
git checkout update-dependencies-1.1
Sign in to join this conversation.
Reviewers
No reviewers
lx
Labels
Clear labels   
action
check-aws
The behaviour should be checked against AWS S3

  
action
discussion-needed
We need to discuss if the feature is desirable and/or better specify the envisioned behavior or technical implementation

  
action
for-external-contributors
Core team does not plan working on this in the near future however an external contribution will be reviewed & merged

  
action
for-newcomers
An issue that should be newcomer friendly.

  
action
more-info-needed
More information is needed to investigate this issue

  
action
need-funding
This issue represents lots of work, we need to find money to pay our core team work

  
action
triage-required
It's not very clear what we want to do with this issue yet, more thoughts is required

  
kind
correctness
Issues of theoretical correctness that may impact edge-case scenarios

  
kind
ideas
For abstract ideas/proposal to make Garage better, to better communicate our not yet achieved aims

  
kind
improvement
Feature requests that do not fall in other categories

  
kind
performance
Deceptive performance observed OR idea to improve performances

  
kind
testing
Functional tests, integration tests, Jepsen, etc.

  
kind
usability
Propositions to make Garage easier to operate, by improving error reporting, CLI, etc.

  
kind
wrong-behavior
Unintended behavior

  
prio
critical
Could impact integrity or availability of production clusters

  
prio
low
For issues that we don't want to spend time on until made absolutely necessary

  
scope
admin-api
Issues concerning the administration API

  
scope
background-healing
Background healing covers repair tasks, anti-entropy, merkle trees, etc. ; everything related to replicating data appropriately.

  
scope
build
Issues with Nix, Drone, Rust Compiler, etc.

  
scope
documentation

  
scope
k8s
Kubernetes related, including Helm Charts

  
scope
layout
Linked to the cluster layout and storage management

  
scope
metadata
Metadata Engine (LMDB, sqlite, etc.)

  
scope
ops
Operations related to operations/maintenance issue, tooling related (like CLI missing info ; impossible, too dangerous, too complicated migration, etc.)

  
scope
rpc
Linked to RPC

  
scope
s3-api
Related to the S3 API (especially compatibility issues).

  
scope
security
Cryptography-related, auth-related, authorization-related issues

  
scope
telemetry
OpenTelemetry (traces, metrics, etc.)

No labels
action
check-aws
action
discussion-needed
action
for-external-contributors
action
for-newcomers
action
more-info-needed
action
need-funding
action
triage-required
kind
correctness
kind
ideas
kind
improvement
kind
performance
kind
testing
kind
usability
kind
wrong-behavior
prio
critical
prio
low
scope
admin-api
scope
background-healing
scope
build
scope
documentation
scope
k8s
scope
layout
scope
metadata
scope
ops
scope
rpc
scope
s3-api
scope
security
scope
telemetry
Milestone
Clear milestone
No items
No milestone
v1.1
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 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#847
No description provided.
Delete branch "update-dependencies-1.1"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?