Deuxfleurs
/
garage
42
37
Fork 55
Code Issues 70 Pull Requests 7 Releases 29 Wiki Activity

cargo: Bump dependencies to latest version #484

Merged
lx merged 17 commits from jpds/garage:cargo-bumps into main 2023-01-26 15:17:10 +00:00
Conversation 6 Commits 17 Files Changed 23 +2750 -2551
jpds commented 2023-01-23 19:57:29 +00:00
Contributor
Copy Link
No description provided.
jpds added 4 commits 2023-01-23 19:57:30 +00:00
jpds force-pushed cargo-bumps from cde822eeeb to 21fe5eb49f 2023-01-23 22:35:13 +00:00 Compare
jpds force-pushed cargo-bumps from 23903c66d2 to d81ebd72e2 2023-01-23 23:04:25 +00:00 Compare
lx commented 2023-01-24 10:23:56 +00:00
Owner
Copy Link

Thanks for this work. Just one note: for rmp-serde, for now I avoided bumping it because it is possible that with new versions the way it serializes Rust structs changed slightly, which would cause incompatibilities in the storage format. If you really want to update it, please make a migration test from an existing Garage installation in a previous version and check that all data is still readable with the updated rmp-serde. But the simplest would probably be to keep rmp-serde v0.15 as it has been working great for us and this way we are sure not to cause any additional issues.

Thanks for this work. Just one note: for `rmp-serde`, for now I avoided bumping it because it is possible that with new versions the way it serializes Rust structs changed slightly, which would cause incompatibilities in the storage format. If you really want to update it, please make a migration test from an existing Garage installation in a previous version and check that all data is still readable with the updated rmp-serde. But the simplest would probably be to keep `rmp-serde v0.15` as it has been working great for us and this way we are sure not to cause any additional issues.
jpds force-pushed cargo-bumps from 166e82c72b to e3526dfca4 2023-01-24 10:29:24 +00:00 Compare
jpds commented 2023-01-24 10:33:15 +00:00
Author
Contributor
Copy Link

@lx I too was sceptical on that one, but I found that they just defauled to string variants anyhow: https://github.com/3Hren/msgpack-rust/pull/286

The other function garage uses they declared "pointless": 2bef91ec4e

I've pulled it for now, but it can be cherry-picked from d81ebd72e2e074687ba94d370e4d0d7b69581b82

@lx I too was sceptical on that one, but I found that they just defauled to string variants anyhow: https://github.com/3Hren/msgpack-rust/pull/286 The other function garage uses they declared "pointless": https://github.com/3Hren/msgpack-rust/commit/2bef91ec4eddfb0747e6e2b69560646f9ad6cdfa I've pulled it for now, but it can be cherry-picked from `d81ebd72e2e074687ba94d370e4d0d7b69581b82`
jpds commented 2023-01-24 10:59:02 +00:00
Author
Contributor
Copy Link

Out of curiousity, I deployed two v0.7.3 garage instances onto my laptop - clustered and uploaded a single file to them. I then performed the migration steps with this branch + the rmp-serde commit and was able to retrieve that file from them. 👍

Out of curiousity, I deployed two `v0.7.3` garage instances onto my laptop - clustered and uploaded a single file to them. I then performed the migration steps with this branch + the `rmp-serde` commit and was able to retrieve that file from them. :+1:
jpds commented 2023-01-24 23:33:44 +00:00
Author
Contributor
Copy Link

I'm happy with shipping the rmp-serde update.

I'm happy with shipping the `rmp-serde` update.
lx requested changes 2023-01-26 10:47:09 +00:00
lx left a comment
Owner
Copy Link

Changes requested in how we use the new base64 API, see below.

Also, can we move the rmp-serde upgrade to a separate PR ? This way we will integrate it in Garage 0.9, which will go through a lot of testing anyway, and the other crate updrades that aren't so critical can go into 0.8.2

Changes requested in how we use the new base64 API, see below. Also, can we move the rmp-serde upgrade to a separate PR ? This way we will integrate it in Garage 0.9, which will go through a lot of testing anyway, and the other crate updrades that aren't so critical can go into 0.8.2
src/api/k2v/batch.rs Outdated
@ -37,0 +36,4 @@
general_purpose::STANDARD
.decode(vs)
.ok_or_bad_request("Invalid base64 value")?,
),
lx commented 2023-01-26 10:41:03 +00:00
Owner
Copy Link

Looks like we can do the following:

use base64::prelude::*;

which allows this to be written more nicely as:

BASE64_STANDARD.decode(vs).ok_or_bad_request("Invalid base64 value")?

Same for all occurrences below

Looks like we can do the following: ``` use base64::prelude::*; ``` which allows this to be written more nicely as: ``` BASE64_STANDARD.decode(vs).ok_or_bad_request("Invalid base64 value")? ``` Same for all occurrences below
jpds marked this conversation as resolved
src/model/k2v/causality.rs Outdated
@ -42,3 +44,3 @@
}
base64::encode_config(bytes, base64::URL_SAFE_NO_PAD)
general_purpose::URL_SAFE_NO_PAD.encode(bytes)
lx commented 2023-01-26 10:43:51 +00:00
Owner
Copy Link
use base64::prelude::*;

// later...
BASE64_URL_SAFE_NO_PAD.encode(bytes)
``` use base64::prelude::*; // later... BASE64_URL_SAFE_NO_PAD.encode(bytes) ```
jpds marked this conversation as resolved
jpds force-pushed cargo-bumps from e071145bac to 3dc655095f 2023-01-26 11:15:54 +00:00 Compare
lx commented 2023-01-26 14:45:39 +00:00
Owner
Copy Link

LGTM. Try merging this commit to have the correct Cargo.nix that should make the CI work: a6534b5881

LGTM. Try merging this commit to have the correct `Cargo.nix` that should make the CI work: https://git.deuxfleurs.fr/Deuxfleurs/garage/commit/a6534b5881518c87271caee02e52c1e199f341e1
jpds added 1 commit 2023-01-26 14:47:40 +00:00
continuous-integration/drone/pr Build is passing Details
0da054194b Update Cargo.nix
lx commented 2023-01-26 15:17:06 +00:00
Owner
Copy Link

Thanks!

Thanks!
lx merged commit 5fb383fe4c into main 2023-01-26 15:17:10 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
lx
Labels
Clear labels   
AdminAPI

Issues concerning the administration API

  
Bug

   
Check AWS

The behaviour should be checked against AWS S3

  
CI

Issues with Nix, Drone, Rust Compiler, etc.

  
Correctness

Issues of theoretical correctness that may impact edge-case scenarios

  
Critical

   
Documentation

   
Ideas

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

  
Improvement

   
Low priority

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

  
Newcomer

A bug that should be newcomer friendly.

  
Performance

   
S3 Compatibility

   
Testing

   
Usability

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

No Label
AdminAPI
Bug
Check AWS
CI
Correctness
Critical
Documentation
Ideas
Improvement
Low priority
Newcomer
Performance
S3 Compatibility
Testing
Usability
Milestone
Clear milestone
No items
No Milestone
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#484
No description provided.
Delete Branch "jpds/garage:cargo-bumps"

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?