1 files changed, 28 insertions, 9 deletions
diff --git a/object/store/packed/quarantine.go b/object/store/packed/quarantine.go
index 5e0b85cb..6f6a8c18 100644
--- a/object/store/packed/quarantine.go
+++ b/object/store/packed/quarantine.go
@@ -95,29 +95,46 @@ func (quarantine *packQuarantine) promoteAll() error {
 		return packPromotionPriority(left.Name()) - packPromotionPriority(right.Name())
 	})
 
+	var created []string
+
 	for _, entry := range entries {
-		err := quarantine.promoteFile(entry.Name())
+		linked, err := quarantine.promoteFile(entry.Name())
 		if err != nil {
+			for i := len(created) - 1; i >= 0; i-- {
+				_ = quarantine.parent.root.Remove(created[i])
+			}
+
 			return err
 		}
+
+		if linked {
+			created = append(created, entry.Name())
+		}
 	}
 
 	return nil
 }
 
-// promoteFile links one quarantined artifact into the parent store,
-// treating an already-present destination as success.
-func (quarantine *packQuarantine) promoteFile(name string) error {
+// promoteFile links one quarantined artifact into the parent store
+// and reports whether the destination was newly created.
+// A pre-existing destination is treated as success; rollback must not remove it.
+func (quarantine *packQuarantine) promoteFile(name string) (bool, error) {
 	src := quarantine.tempName + "/" + name
 
 	err := quarantine.parent.root.Link(src, name)
-	if err != nil && !errors.Is(err, fs.ErrExist) {
-		return fmt.Errorf("object/store/packed: promoting %q: %w", name, err)
-	}
 
-	_ = quarantine.parent.root.Remove(src)
+	switch {
+	case err == nil:
+		_ = quarantine.parent.root.Remove(src)
 
-	return nil
+		return true, nil
+	case errors.Is(err, fs.ErrExist):
+		_ = quarantine.parent.root.Remove(src)
+
+		return false, nil
+	default:
+		return false, fmt.Errorf("object/store/packed: promoting %q: %w", name, err)
+	}
 }
 
 // createPackQuarantineRoot creates a private quarantine directory beneath parent
@@ -156,6 +173,8 @@ func packPromotionPriority(name string) int {
 		return 1
 	case strings.HasPrefix(name, "pack-") && strings.HasSuffix(name, ".rev"):
 		return 2
+	case strings.HasPrefix(name, "pack-") && strings.HasSuffix(name, ".bloom"):
+		return 2
 	case strings.HasPrefix(name, "pack-") && strings.HasSuffix(name, ".idx"):
 		return 3
 	default: