diff options
| author | Alex <alex@adnab.me> | 2024-04-10 15:23:12 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2024-04-10 15:23:12 +0000 |
| commit | 1779fd40c0fe676bedda0d40f647d7fe8b0f1e7e (patch) | |
| tree | 47e42c4e6ae47590fbb5c8f94e90a23bf04c1674 /src/model/s3/mpu_table.rs | |
| parent | b47706809cc9d28d1328bafdf9756e96388cca24 (diff) | |
| parent | ff093ddbb8485409f389abe7b5e569cb38d222d2 (diff) | |
| download | garage-1779fd40c0fe676bedda0d40f647d7fe8b0f1e7e.tar.gz garage-1779fd40c0fe676bedda0d40f647d7fe8b0f1e7e.zip | |
Merge pull request 'Garage v1.0' (#683) from next-0.10 into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/683
Diffstat (limited to 'src/model/s3/mpu_table.rs')
| -rw-r--r-- | src/model/s3/mpu_table.rs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/model/s3/mpu_table.rs b/src/model/s3/mpu_table.rs index 238cbf11..c9f79caf 100644 --- a/src/model/s3/mpu_table.rs +++ b/src/model/s3/mpu_table.rs @@ -17,6 +17,7 @@ pub const PARTS: &str = "parts"; pub const BYTES: &str = "bytes"; mod v09 { + use crate::s3::object_table::ChecksumValue; use garage_util::crdt; use garage_util::data::Uuid; use serde::{Deserialize, Serialize}; @@ -61,6 +62,9 @@ mod v09 { pub version: Uuid, /// ETag of the content of this part (known only once done uploading) pub etag: Option<String>, + /// Checksum requested by x-amz-checksum-algorithm + #[serde(default)] + pub checksum: Option<ChecksumValue>, /// Size of this part (known only once done uploading) pub size: Option<u64>, } @@ -155,6 +159,11 @@ impl Crdt for MpuPart { (Some(x), Some(y)) if x < y => other.size, (x, _) => x, }; + self.checksum = match (self.checksum.take(), &other.checksum) { + (None, Some(_)) => other.checksum.clone(), + (Some(x), Some(y)) if x < *y => other.checksum.clone(), + (x, _) => x, + }; } } |