Handle truncated bundles gracefully during restore

Author: joshfriend

gradlecache/gradlecache_test.go

@@ -5,6 +5,7 @@ import (
 	archive_tar "archive/tar"
 	"bytes"
 	"context"
+	stderrors "errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -487,6 +488,41 @@ func TestExtractZstdDrainsBufferedReaderToEOF(t *testing.T) {
 	})
 }
 
+// ─── Truncated archive test ──────────────────────────────────────────────────
+
+// TestExtractBundleTruncatedArchive verifies that extractBundleZstd returns an
+// io.ErrUnexpectedEOF when the archive is truncated, so the caller can warn
+// instead of fatally erroring out.
+func TestExtractBundleTruncatedArchive(t *testing.T) {
+	ctx := context.Background()
+	srcDir := t.TempDir()
+
+	// Create two files so we can truncate mid-archive.
+	must(t, os.MkdirAll(filepath.Join(srcDir, "caches"), 0o755))
+	must(t, os.WriteFile(filepath.Join(srcDir, "caches", "first.jar"), bytes.Repeat([]byte("A"), 4096), 0o644))
+	must(t, os.WriteFile(filepath.Join(srcDir, "caches", "second.jar"), bytes.Repeat([]byte("B"), 4096), 0o644))
+
+	var archive bytes.Buffer
+	must(t, CreateDeltaTarZstd(ctx, &archive, srcDir, []string{"caches/first.jar", "caches/second.jar"}))
+
+	// Truncate the compressed archive at roughly 60% to simulate a partial upload.
+	truncated := archive.Bytes()[:archive.Len()*60/100]
+
+	gradleHome := t.TempDir()
+	projectDir := t.TempDir()
+
+	_, err := extractBundleZstd(ctx, bytes.NewReader(truncated), []extractRule{
+		{prefix: "caches/", baseDir: gradleHome},
+	}, projectDir, false)
+
+	if err == nil {
+		t.Fatal("expected an error from truncated archive, got nil")
+	}
+	if !stderrors.Is(err, io.ErrUnexpectedEOF) {
+		t.Fatalf("expected io.ErrUnexpectedEOF in error chain, got: %v", err)
+	}
+}
+
 // ─── Round-trip archive test ─────────────────────────────────────────────────
 
 // TestTarZstdRoundTrip verifies that CreateTarZstd → extractTarZstd preserves

gradlecache/restore.go

@@ -436,7 +436,15 @@ func Restore(ctx context.Context, cfg RestoreConfig) error {
 	netTiming := &timingReader{r: cb}
 	ps, err := extractBundleZstd(ctx, netTiming, rules, cfg.ProjectDir, !gradleUserHomeEmpty)
 	if err != nil {
-		return errors.Wrap(err, "extract bundle")
+		// A truncated tar archive (e.g. from a crash during upload) produces an
+		// unexpected EOF during extraction. Treat this as a warning rather than
+		// a fatal error: the files extracted before the truncation point are
+		// still usable and better than no cache at all.
+		if errors.Is(err, io.ErrUnexpectedEOF) {
+			log.Warn("bundle appears truncated! using partially extracted cache", "err", err)
+		} else {
+			return errors.Wrap(err, "extract bundle")
+		}
 	}
 
 	totalElapsed := time.Since(dlStart)