Skip to content

Add file system access profile to execute response #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
osjo-meroton wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add file system access profile to execute response #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions pkg/builder/prefetching_build_executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,13 @@ func (be *prefetchingBuildExecutor) Execute(ctx context.Context, filePool pool.F
return nil
})

if err := group.Wait(); err == nil {
err = group.Wait()
newProfile := be.computeProfile(bloomFilterMonitor)
if err == nil {
// Action completed successfully. Store an updated
// profile in the File System Access Cache if it is
// different from the one fetched previously.
if newProfile := be.computeProfile(bloomFilterMonitor); !proto.Equal(existingProfile, newProfile) {
if !proto.Equal(existingProfile, newProfile) {
if err := be.fileSystemAccessCache.Put(ctx, reducedActionDigest, buffer.NewProtoBufferFromProto(newProfile, buffer.UserProvided)); err != nil {
attachErrorToExecuteResponse(response, util.StatusWrap(err, "Failed to store file system access profile"))
}
Expand All @@ -165,6 +167,11 @@ func (be *prefetchingBuildExecutor) Execute(ctx context.Context, filePool pool.F
response.Status = status.Convert(err).Proto()
}

if newProfilePb, err := anypb.New(newProfile); err == nil {
response.Result.ExecutionMetadata.AuxiliaryMetadata = append(response.Result.ExecutionMetadata.AuxiliaryMetadata, newProfilePb)
} else {
attachErrorToExecuteResponse(response, util.StatusWrap(err, "Failed to marshal file system access profile"))
}
if resourceUsage, err := anypb.New(bloomFilterMonitor.GetInputRootResourceUsage()); err == nil {
response.Result.ExecutionMetadata.AuxiliaryMetadata = append(response.Result.ExecutionMetadata.AuxiliaryMetadata, resourceUsage)
} else {
Expand Down
22 changes: 15 additions & 7 deletions pkg/builder/prefetching_build_executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ func TestPrefetchingBuildExecutor(t *testing.T) {
digestFunction := digest.MustNewFunction("hello", remoteexecution.DigestFunction_MD5)
executionStateUpdates := make(chan<- *remoteworker.CurrentState_Executing)

defaultFileSystemAccessProfile, err := anypb.New(&fsac.FileSystemAccessProfile{
BloomFilter: []byte{0x80},
BloomFilterHashFunctions: 1,
})
defaultInputRootResourceUsage, err := anypb.New(&resourceusage.InputRootResourceUsage{
DirectoriesResolved: 1,
DirectoriesRead: 0,
Expand Down Expand Up @@ -207,7 +211,7 @@ func TestPrefetchingBuildExecutor(t *testing.T) {
&remoteexecution.ExecuteResponse{
Result: &remoteexecution.ActionResult{
ExecutionMetadata: &remoteexecution.ExecutedActionMetadata{
AuxiliaryMetadata: []*anypb.Any{defaultInputRootResourceUsage},
AuxiliaryMetadata: []*anypb.Any{defaultFileSystemAccessProfile, defaultInputRootResourceUsage},
},
},
Status: status.New(codes.Internal, "Failed to fetch file system access profile: Storage offline").Proto(),
Expand Down Expand Up @@ -256,7 +260,7 @@ func TestPrefetchingBuildExecutor(t *testing.T) {
&remoteexecution.ExecuteResponse{
Result: &remoteexecution.ActionResult{
ExecutionMetadata: &remoteexecution.ExecutedActionMetadata{
AuxiliaryMetadata: []*anypb.Any{defaultInputRootResourceUsage},
AuxiliaryMetadata: []*anypb.Any{defaultFileSystemAccessProfile, defaultInputRootResourceUsage},
},
},
Status: status.New(codes.Internal, "Failed to prefetch directory \".\": Storage offline").Proto(),
Expand Down Expand Up @@ -317,7 +321,7 @@ func TestPrefetchingBuildExecutor(t *testing.T) {
&remoteexecution.ExecuteResponse{
Result: &remoteexecution.ActionResult{
ExecutionMetadata: &remoteexecution.ExecutedActionMetadata{
AuxiliaryMetadata: []*anypb.Any{defaultInputRootResourceUsage},
AuxiliaryMetadata: []*anypb.Any{defaultFileSystemAccessProfile, defaultInputRootResourceUsage},
},
},
Status: status.New(codes.Internal, "Failed to prefetch file \"hello.txt\": Storage offline").Proto(),
Expand Down Expand Up @@ -366,7 +370,7 @@ func TestPrefetchingBuildExecutor(t *testing.T) {
&remoteexecution.ExecuteResponse{
Result: &remoteexecution.ActionResult{
ExecutionMetadata: &remoteexecution.ExecutedActionMetadata{
AuxiliaryMetadata: []*anypb.Any{defaultInputRootResourceUsage},
AuxiliaryMetadata: []*anypb.Any{defaultFileSystemAccessProfile, defaultInputRootResourceUsage},
},
},
Status: status.New(codes.Internal, "Failed to store file system access profile: Storage offline").Proto(),
Expand Down Expand Up @@ -408,7 +412,7 @@ func TestPrefetchingBuildExecutor(t *testing.T) {
&remoteexecution.ExecuteResponse{
Result: &remoteexecution.ActionResult{
ExecutionMetadata: &remoteexecution.ExecutedActionMetadata{
AuxiliaryMetadata: []*anypb.Any{defaultInputRootResourceUsage},
AuxiliaryMetadata: []*anypb.Any{defaultFileSystemAccessProfile, defaultInputRootResourceUsage},
},
},
},
Expand Down Expand Up @@ -456,7 +460,11 @@ func TestPrefetchingBuildExecutor(t *testing.T) {
}, profile)
return nil
})

fileSystemAccessProfile, err := anypb.New(&fsac.FileSystemAccessProfile{
BloomFilter: []byte{0x0b, 0x2a},
BloomFilterHashFunctions: 9,
})
require.NoError(t, err)
inputRootResourceUsage, err := anypb.New(&resourceusage.InputRootResourceUsage{
DirectoriesResolved: 1,
DirectoriesRead: 1,
Expand All @@ -468,7 +476,7 @@ func TestPrefetchingBuildExecutor(t *testing.T) {
&remoteexecution.ExecuteResponse{
Result: &remoteexecution.ActionResult{
ExecutionMetadata: &remoteexecution.ExecutedActionMetadata{
AuxiliaryMetadata: []*anypb.Any{inputRootResourceUsage},
AuxiliaryMetadata: []*anypb.Any{fileSystemAccessProfile, inputRootResourceUsage},
},
},
},
Expand Down