Skip to main content

max / makenotwork

storage: abort multipart upload on completion failure Drive Storage's Sto-S1 to A (ultra-fuzz Run 7). upload_multipart's complete_multipart_upload failure branch returned Err via `?` without aborting, leaving the multipart upload and all uploaded parts stranded server-side (storage cost) — every other failure branch already aborts. Abort before returning Err, honoring the function's "aborts on failure" contract. Also parenthesize a pre-existing precedence-warned shift in the retry backoff. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Author: Max Johnson <me@maxj.phd> · 2026-06-24 22:16 UTC
Commit: 5540d16e1b1b6a4446b556e2c2bf1aca438a1cee
Parent: 240a4ca
1 file changed, +11 insertions, -3 deletions
M shared/s3-storage/src/lib.rs +11 -3
@@ -500,7 +500,7 @@ impl S3Client {
500 500 // Backoff: 200ms, 800ms. Cheap enough not to
501 501 // mask a permanent failure; long enough that
502 502 // a brief network glitch resolves.
503 - let delay_ms = 200u64 * (1u64 << (attempt - 1) * 2);
503 + let delay_ms = 200u64 * (1u64 << ((attempt - 1) * 2));
504 504 tracing::warn!(
505 505 part_number, attempt, delay_ms, error = ?e,
506 506 "S3 upload_part transient failure, retrying"
@@ -540,7 +540,8 @@ impl S3Client {
540 540 .set_parts(Some(completed_parts))
541 541 .build();
542 542
543 - self.client
543 + if let Err(e) = self
544 + .client
544 545 .complete_multipart_upload()
545 546 .bucket(&self.bucket)
546 547 .key(key)
@@ -548,7 +549,14 @@ impl S3Client {
548 549 .multipart_upload(completed)
549 550 .send()
550 551 .await
551 - .map_err(|e| format!("S3 complete multipart upload failed: {e}"))?;
552 + {
553 + // Abort before returning, like every other failure branch (Sto-S1).
554 + // Without this, a failed completion leaves the multipart upload and all
555 + // its uploaded parts stranded server-side, accruing storage cost and
556 + // violating this function's "aborts on failure" contract.
557 + self.abort_multipart_upload(key, &upload_id).await;
558 + return Err(format!("S3 complete multipart upload failed: {e}"));
559 + }
552 560
553 561 Ok(())
554 562 }