Revert #3075 fix(orchestrator): seed legacy-ancestor... (#3141)

Author: levb

packages/shared/pkg/storage/header/diff_test.go

@@ -3,11 +3,7 @@ package header
 import (
 	"testing"
 
-	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/e2b-dev/infra/packages/shared/pkg/storage"
 )
 
 func TestIsZero(t *testing.T) {
@@ -26,51 +22,3 @@ func TestIsZero(t *testing.T) {
 	buf[RootfsBlockSize-2] = 0xFF
 	assert.False(t, IsZero(buf), "non-zero just before the last sampled byte")
 }
-
-// newDiffHeader must carry forward ancestors the source knows about and
-// backfill the uncompressed sentinel for ones it lacks, so a legacy ancestor
-// resolves via GetBuildFrameData (no doomed proactive header load) while the
-// still-unuploaded self build stays absent.
-func TestNewDiffHeaderBackfillsAncestors(t *testing.T) {
-	t.Parallel()
-
-	const bs = 4096
-	self := uuid.New()
-	knownAncestor := uuid.New()
-	legacyAncestor := uuid.New()
-
-	mapping := []BuildMap{
-		{Offset: 0, Length: bs, BuildId: self, BuildStorageOffset: 0},
-		{Offset: bs, Length: bs, BuildId: knownAncestor, BuildStorageOffset: 0},
-		{Offset: 2 * bs, Length: bs, BuildId: legacyAncestor, BuildStorageOffset: 0},
-		{Offset: 3 * bs, Length: bs, BuildId: uuid.Nil, BuildStorageOffset: 0},
-	}
-
-	// Parent header carries only knownAncestor; legacyAncestor predates per-build
-	// headers and is absent from the source.
-	sourceBuilds := map[uuid.UUID]BuildData{knownAncestor: {Size: 123}}
-
-	meta := &Metadata{Version: MetadataVersionV4, BlockSize: bs, Size: 4 * bs, BuildId: self, BaseBuildId: legacyAncestor}
-	h, err := newDiffHeader(meta, mapping, sourceBuilds)
-	require.NoError(t, err)
-
-	// Self is excluded: its data isn't uploaded yet.
-	_, hasSelf := h.Builds[self]
-	require.False(t, hasSelf)
-
-	// Known ancestor carried forward verbatim (not clobbered by the sentinel).
-	require.Equal(t, BuildData{Size: 123}, h.Builds[knownAncestor])
-
-	// Legacy ancestor gets the uncompressed sentinel, so GetBuildFrameData
-	// returns a non-nil table and the read path never proactively refreshes it.
-	bd, hasLegacy := h.Builds[legacyAncestor]
-	require.True(t, hasLegacy)
-	require.Equal(t, BuildData{}, bd)
-	require.Equal(t, storage.UncompressedFrameTable, h.GetBuildFrameData(legacyAncestor))
-
-	// Empty (uuid.Nil) regions don't create entries.
-	_, hasNil := h.Builds[uuid.Nil]
-	require.False(t, hasNil)
-
-	require.True(t, h.IncompletePendingUpload)
-}

packages/shared/pkg/storage/header/header.go

@@ -109,23 +109,14 @@ func newDiffHeader(metadata *Metadata, mapping []BuildMap, sourceBuilds map[uuid
 		return nil, err
 	}
 
-	// Carry every still-referenced ancestor forward, backfilling the uncompressed
-	// sentinel (zero BuildData) for the ones the source lacks — the same gap
-	// LoadHeader closes for stored headers. Without it a legacy (pre-header)
-	// ancestor is absent from Builds, so the read path issues a doomed proactive
-	// header load for it before falling back to uncompressed. Self is left out: a
-	// pending header carries no self entry by design (its data is still local and
-	// served from the cache), and the finalized header swapped in at upload
-	// carries the real self entry — never a zero sentinel.
-	h.Builds = make(map[uuid.UUID]BuildData, len(h.Mapping.Builds()))
-	for _, id := range h.Mapping.Builds() {
-		if id == metadata.BuildId || id == uuid.Nil {
-			continue
-		}
-		if bd, ok := sourceBuilds[id]; ok {
-			h.Builds[id] = bd
-		} else {
-			h.Builds[id] = BuildData{}
+	if sourceBuilds != nil {
+		// h.Mapping.Builds() is already deduped at NewMapping construction;
+		// no need for an oversized temp set keyed by len(mapping).
+		h.Builds = make(map[uuid.UUID]BuildData, len(sourceBuilds))
+		for _, id := range h.Mapping.Builds() {
+			if bd, ok := sourceBuilds[id]; ok {
+				h.Builds[id] = bd
+			}
 		}
 	}