Expose internal scheduling metadata #2873
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| package scheduling | ||
|
|
||
| import ( | ||
| "cmp" | ||
| "slices" | ||
|
|
||
| "github.com/google/uuid" | ||
|
|
||
| "github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator" | ||
| "github.com/e2b-dev/infra/packages/shared/pkg/storage/header" | ||
| ) | ||
|
|
||
| const chainLimit = 32 | ||
|
|
||
| type buildContribution struct { | ||
| buildID uuid.UUID | ||
| memfileBytes uint64 | ||
| memfileMappingCount uint32 | ||
| rootfsBytes uint64 | ||
| rootfsMappingCount uint32 | ||
| } | ||
|
|
||
| func FromHeaders(memfileHeader, rootfsHeader *header.Header) *orchestrator.SchedulingMetadata { | ||
| if memfileHeader == nil || memfileHeader.Metadata == nil || rootfsHeader == nil || rootfsHeader.Metadata == nil { | ||
| return nil | ||
| } | ||
|
|
||
| contributions := make(map[uuid.UUID]*buildContribution) | ||
| add := func(buildID uuid.UUID, length uint64, isMemfile bool) { | ||
| if buildID == uuid.Nil || length == 0 { | ||
| return | ||
| } | ||
| c, ok := contributions[buildID] | ||
| if !ok { | ||
| c = &buildContribution{buildID: buildID} | ||
| contributions[buildID] = c | ||
| } | ||
| if isMemfile { | ||
| c.memfileBytes += length | ||
| c.memfileMappingCount++ | ||
| } else { | ||
| c.rootfsBytes += length | ||
| c.rootfsMappingCount++ | ||
| } | ||
| } | ||
|
|
||
| for _, m := range memfileHeader.Mapping.All() { | ||
| add(m.BuildId, m.Length, true) | ||
| } | ||
| for _, m := range rootfsHeader.Mapping.All() { | ||
| add(m.BuildId, m.Length, false) | ||
| } | ||
|
|
||
| baseBuildID := memfileHeader.Metadata.BaseBuildId | ||
| if baseBuildID == uuid.Nil { | ||
| baseBuildID = rootfsHeader.Metadata.BaseBuildId | ||
| } | ||
|
|
||
| chain := make([]buildContribution, 0, len(contributions)) | ||
| for _, c := range contributions { | ||
| chain = append(chain, *c) | ||
| } | ||
| slices.SortFunc(chain, func(a, b buildContribution) int { | ||
| aBytes := a.memfileBytes + a.rootfsBytes | ||
| bBytes := b.memfileBytes + b.rootfsBytes | ||
| if aBytes == bBytes { | ||
| return cmp.Compare(a.buildID.String(), b.buildID.String()) | ||
| } | ||
|
|
||
| return cmp.Compare(bBytes, aBytes) | ||
| }) | ||
| if len(chain) > chainLimit { | ||
| chain = chain[:chainLimit] | ||
| } | ||
|
|
||
| res := &orchestrator.SchedulingMetadata{ | ||
| BaseBuildId: baseBuildID.String(), | ||
| Generation: max(memfileHeader.Metadata.Generation, rootfsHeader.Metadata.Generation) + 1, | ||
|
There was a problem hiding this comment.
This helper is also called by Useful? React with 👍 / 👎. There was a problem hiding this comment. Generation incremented twiceHigh Severity
Additional Locations (2)  Reviewed by Cursor Bugbot for commit d216050. Configure here. |
||
| MemfileSize: memfileHeader.Metadata.Size, | ||
| RootfsSize: rootfsHeader.Metadata.Size, | ||
| ChainBuildIds: make([]string, 0, len(chain)), | ||
| MemfileLogicalBytes: make([]uint64, 0, len(chain)), | ||
| MemfileMappingCounts: make([]uint32, 0, len(chain)), | ||
| RootfsLogicalBytes: make([]uint64, 0, len(chain)), | ||
| RootfsMappingCounts: make([]uint32, 0, len(chain)), | ||
| } | ||
| for _, c := range chain { | ||
| res.ChainBuildIds = append(res.ChainBuildIds, c.buildID.String()) | ||
| res.MemfileLogicalBytes = append(res.MemfileLogicalBytes, c.memfileBytes) | ||
| res.MemfileMappingCounts = append(res.MemfileMappingCounts, c.memfileMappingCount) | ||
| res.RootfsLogicalBytes = append(res.RootfsLogicalBytes, c.rootfsBytes) | ||
| res.RootfsMappingCounts = append(res.RootfsMappingCounts, c.rootfsMappingCount) | ||
| } | ||
|
|
||
| return res | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When a template was loaded from storage and only some chunks have been read,
item.Value().FileSize(ctx)is the local cache file size, not the uncompressed diff size, so copying it into*TotalBytesmakesListCachedBuildsreport the diff as 100% cached. In that partial-cache scenario, schedulers using these new fields will overestimate locality and route work to a node that still has to fetch most of the data remotely.Useful? React with 👍 / 👎.