Skip to content

Commit 7204e07

Browse files
Remove in_memory and directory_path file pools
Remove the in_memory and directory_path file pools. These filepools are better to replace with the block_device backed filepool which supports sparse files and behaves better during circumstances with scarce resources.
1 parent 1c726bd commit 7204e07

10 files changed

+39
-427
lines changed

pkg/builder/file_pool_stats_build_executor_test.go

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,29 @@ func TestFilePoolStatsBuildExecutorExample(t *testing.T) {
7070
}
7171
})
7272

73+
// Mock all the file operations performed in the execution request.
74+
filePool := mock.NewMockFilePool(ctrl)
75+
file1 := mock.NewMockFileReadWriter(ctrl)
76+
file2 := mock.NewMockFileReadWriter(ctrl)
77+
78+
filePool.EXPECT().NewFile().Return(file1, nil)
79+
file1.EXPECT().Truncate(int64(5)).Return(nil)
80+
file1.EXPECT().Close().Return(nil)
81+
filePool.EXPECT().NewFile().Return(file2, nil)
82+
file2.EXPECT().WriteAt([]byte("Hello"), int64(100)).Return(5, nil)
83+
file2.EXPECT().ReadAt(gomock.Any(), int64(98)).DoAndReturn(func(p []byte, offset int64) (int, error) {
84+
copy(p, []byte("\x00\x00Hello\x00\x00\x00"))
85+
return 7, io.EOF
86+
})
87+
file2.EXPECT().Truncate(int64(42)).Return(nil)
88+
file2.EXPECT().Close().Return(nil)
89+
7390
// Perform the execution request.
7491
executionStateUpdates := make(chan *remoteworker.CurrentState_Executing, 3)
7592
buildExecutor := builder.NewFilePoolStatsBuildExecutor(baseBuildExecutor)
7693
executeResponse := buildExecutor.Execute(
7794
ctx,
78-
filesystem.InMemoryFilePool,
95+
filePool,
7996
monitor,
8097
digest.MustNewFunction("hello", remoteexecution.DigestFunction_MD5),
8198
request,

pkg/filesystem/BUILD.bazel

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ go_library(
66
"bitmap_sector_allocator.go",
77
"block_device_backed_file_pool.go",
88
"configuration.go",
9-
"directory_backed_file_pool.go",
109
"empty_file_pool.go",
1110
"file_pool.go",
12-
"in_memory_file_pool.go",
1311
"lazy_directory.go",
1412
"metrics_file_pool.go",
1513
"quota_enforcing_file_pool.go",
@@ -34,9 +32,7 @@ go_test(
3432
srcs = [
3533
"bitmap_sector_allocator_test.go",
3634
"block_device_backed_file_pool_test.go",
37-
"directory_backed_file_pool_test.go",
3835
"empty_file_pool_test.go",
39-
"in_memory_file_pool_test.go",
4036
"lazy_directory_test.go",
4137
"quota_enforcing_file_pool_test.go",
4238
],

pkg/filesystem/configuration.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import (
55

66
pb "github.com/buildbarn/bb-remote-execution/pkg/proto/configuration/filesystem"
77
"github.com/buildbarn/bb-storage/pkg/blockdevice"
8-
"github.com/buildbarn/bb-storage/pkg/filesystem"
9-
"github.com/buildbarn/bb-storage/pkg/filesystem/path"
108
"github.com/buildbarn/bb-storage/pkg/util"
119

1210
"google.golang.org/grpc/codes"
@@ -25,18 +23,6 @@ func NewFilePoolFromConfiguration(configuration *pb.FilePoolConfiguration) (File
2523

2624
var filePool FilePool
2725
switch backend := configuration.Backend.(type) {
28-
case *pb.FilePoolConfiguration_InMemory:
29-
filePool = InMemoryFilePool
30-
case *pb.FilePoolConfiguration_DirectoryPath:
31-
directory, err := filesystem.NewLocalDirectory(path.LocalFormat.NewParser(backend.DirectoryPath))
32-
if err != nil {
33-
return nil, util.StatusWrapf(err, "Failed to open directory %#v", backend.DirectoryPath)
34-
}
35-
if err := directory.RemoveAllChildren(); err != nil {
36-
directory.Close()
37-
return nil, util.StatusWrapf(err, "Failed to empty out directory %#v", backend.DirectoryPath)
38-
}
39-
filePool = NewDirectoryBackedFilePool(directory)
4026
case *pb.FilePoolConfiguration_BlockDevice:
4127
blockDevice, sectorSizeBytes, sectorCount, err := blockdevice.NewBlockDeviceFromConfiguration(backend.BlockDevice, true)
4228
if err != nil {

pkg/filesystem/directory_backed_file_pool.go

Lines changed: 0 additions & 106 deletions
This file was deleted.

pkg/filesystem/directory_backed_file_pool_test.go

Lines changed: 0 additions & 96 deletions
This file was deleted.

pkg/filesystem/in_memory_file_pool.go

Lines changed: 0 additions & 81 deletions
This file was deleted.

0 commit comments

Comments
 (0)