Skip to content

Don't patch non-stub drives #240

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

Merged
merged 3 commits into from
Aug 6, 2019
Merged

Don't patch non-stub drives #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cf15f3
Don't let a stub drive handler know non-stub drives
kzys Aug 5, 2019
c5f0c63
Specify the size since we know that beforehand
kzys Aug 6, 2019
0f7744f
Ignore `appendAssign: append result not assigned to the same slice`
kzys Aug 6, 2019
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
52 changes: 32 additions & 20 deletions runtime/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,25 @@ func (s *service) SetVMMetadata(requestCtx context.Context, request *proto.SetVM
return &empty.Empty{}, nil
}

func (s *service) createStubDrives(stubDriveCount int) ([]models.Drive, error) {
paths, err := s.stubDriveHandler.StubDrivePaths(stubDriveCount)
if err != nil {
return nil, errors.Wrap(err, "failed to retrieve stub drive paths")
}

stubDrives := make([]models.Drive, 0, stubDriveCount)
for i, path := range paths {
stubDrives = append(stubDrives, models.Drive{
DriveID: firecracker.String(fmt.Sprintf("stub%d", i)),
IsReadOnly: firecracker.Bool(false),
PathOnHost: firecracker.String(path),
IsRootDevice: firecracker.Bool(false),
})
}

return stubDrives, nil
}

func (s *service) buildVMConfiguration(req *proto.CreateVMRequest) (*firecracker.Config, error) {
logger := s.logger.WithField("cid", s.machineCID)

Expand Down Expand Up @@ -618,15 +637,6 @@ func (s *service) buildVMConfiguration(req *proto.CreateVMRequest) (*firecracker
}

// Drives configuration

var driveBuilder firecracker.DrivesBuilder
if root := req.RootDrive; root != nil {
driveBuilder = firecracker.NewDrivesBuilder(root.PathOnHost)
} else {
driveBuilder = firecracker.NewDrivesBuilder(s.config.RootDrive)
}

stubDriveIndex := int64(len(driveBuilder.Build()) - 1)
containerCount := int(req.ContainerCount)
if containerCount < 1 {
// containerCount should always be positive so that at least one container
Expand All @@ -635,26 +645,28 @@ func (s *service) buildVMConfiguration(req *proto.CreateVMRequest) (*firecracker
containerCount = 1
}

paths, err := s.stubDriveHandler.StubDrivePaths(containerCount)
// Create stub drives first and let stub driver handler manage the drives
stubDrives, err := s.createStubDrives(containerCount)
if err != nil {
return nil, errors.Wrap(err, "failed to retrieve stub drive paths")
return nil, errors.Wrap(err, "failed to create stub drives")
}
s.stubDriveHandler.SetDrives(0, stubDrives)

for i, path := range paths {
driveID := fmt.Sprintf("stub%d", i)
driveBuilder = driveBuilder.AddDrive(path, false, func(drive *models.Drive) {
drive.DriveID = firecracker.String(driveID)
})
var driveBuilder firecracker.DrivesBuilder
// Create non-stub drives
if root := req.RootDrive; root != nil {
driveBuilder = firecracker.NewDrivesBuilder(root.PathOnHost)
} else {
driveBuilder = firecracker.NewDrivesBuilder(s.config.RootDrive)
}

cfg.Drives = driveBuilder.Build()
s.stubDriveHandler.SetDrives(stubDriveIndex, cfg.Drives)

for _, drive := range req.AdditionalDrives {
driveBuilder = addDriveFromProto(driveBuilder, drive)
}

cfg.Drives = driveBuilder.Build()
// a micro VM must know all drives
// nolint: gocritic
cfg.Drives = append(stubDrives, driveBuilder.Build()...)

// Setup network interfaces

Expand Down
63 changes: 49 additions & 14 deletions runtime/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,12 @@ func TestFindNextAvailableVsockCID_Isolated(t *testing.T) {

func TestBuildVMConfiguration(t *testing.T) {
namespace := "TestBuildVMConfiguration"
rootfsDrive := models.Drive{
DriveID: firecracker.String("stub0"),
PathOnHost: nil, // will be populated in the for loop
IsReadOnly: firecracker.Bool(false),
IsRootDevice: firecracker.Bool(false),
}
testcases := []struct {
name string
request *proto.CreateVMRequest
config *Config
expectedCfg *firecracker.Config
name string
request *proto.CreateVMRequest
config *Config
expectedCfg *firecracker.Config
expectedStubDriveCount int
}{
{
name: "ConfigFile",
Expand All @@ -88,7 +83,6 @@ func TestBuildVMConfiguration(t *testing.T) {
KernelArgs: "KERNEL ARGS",
KernelImagePath: "KERNEL IMAGE",
Drives: []models.Drive{
rootfsDrive,
{
DriveID: firecracker.String("root_drive"),
PathOnHost: firecracker.String("ROOT DRIVE"),
Expand All @@ -103,6 +97,7 @@ func TestBuildVMConfiguration(t *testing.T) {
HtEnabled: firecracker.Bool(false),
},
},
expectedStubDriveCount: 1,
},
{
name: "Input",
Expand All @@ -122,7 +117,6 @@ func TestBuildVMConfiguration(t *testing.T) {
KernelArgs: "REQUEST KERNEL ARGS",
KernelImagePath: "REQUEST KERNEL IMAGE",
Drives: []models.Drive{
rootfsDrive,
{
DriveID: firecracker.String("root_drive"),
PathOnHost: firecracker.String("REQUEST ROOT DRIVE"),
Expand All @@ -137,6 +131,7 @@ func TestBuildVMConfiguration(t *testing.T) {
HtEnabled: firecracker.Bool(false),
},
},
expectedStubDriveCount: 1,
},
{
name: "Priority",
Expand All @@ -160,7 +155,6 @@ func TestBuildVMConfiguration(t *testing.T) {
KernelArgs: "REQUEST KERNEL ARGS",
KernelImagePath: "KERNEL IMAGE",
Drives: []models.Drive{
rootfsDrive,
{
DriveID: firecracker.String("root_drive"),
PathOnHost: firecracker.String("REQUEST ROOT DRIVE"),
Expand All @@ -175,6 +169,37 @@ func TestBuildVMConfiguration(t *testing.T) {
HtEnabled: firecracker.Bool(false),
},
},
expectedStubDriveCount: 1,
},
{
name: "Container Count",
request: &proto.CreateVMRequest{ContainerCount: 2},
config: &Config{
KernelArgs: "KERNEL ARGS",
KernelImagePath: "KERNEL IMAGE",
RootDrive: "ROOT DRIVE",
CPUTemplate: "C3",
CPUCount: 2,
},
expectedCfg: &firecracker.Config{
KernelArgs: "KERNEL ARGS",
KernelImagePath: "KERNEL IMAGE",
Drives: []models.Drive{
{
DriveID: firecracker.String("root_drive"),
PathOnHost: firecracker.String("ROOT DRIVE"),
IsReadOnly: firecracker.Bool(false),
IsRootDevice: firecracker.Bool(true),
},
},
MachineCfg: models.MachineConfiguration{
CPUTemplate: models.CPUTemplateC3,
VcpuCount: firecracker.Int64(2),
MemSizeMib: firecracker.Int64(defaultMemSizeMb),
HtEnabled: firecracker.Bool(false),
},
},
expectedStubDriveCount: 2,
},
}

Expand All @@ -197,11 +222,21 @@ func TestBuildVMConfiguration(t *testing.T) {
tc.expectedCfg.VsockDevices = []firecracker.VsockDevice{{Path: "root", CID: svc.machineCID}}
tc.expectedCfg.LogFifo = svc.shimDir.FirecrackerLogFifoPath()
tc.expectedCfg.MetricsFifo = svc.shimDir.FirecrackerMetricsFifoPath()
tc.expectedCfg.Drives[0].PathOnHost = firecracker.String(filepath.Join(tempDir, "stub0"))

drives := make([]models.Drive, tc.expectedStubDriveCount)
for i := 0; i < tc.expectedStubDriveCount; i++ {
drives[i].PathOnHost = firecracker.String(filepath.Join(tempDir, fmt.Sprintf("stub%d", i)))
drives[i].DriveID = firecracker.String(fmt.Sprintf("stub%d", i))
drives[i].IsReadOnly = firecracker.Bool(false)
drives[i].IsRootDevice = firecracker.Bool(false)
}
tc.expectedCfg.Drives = append(drives, tc.expectedCfg.Drives...)

actualCfg, err := svc.buildVMConfiguration(tc.request)
assert.NoError(t, err)
require.Equal(t, tc.expectedCfg, actualCfg)

require.Equal(t, tc.expectedStubDriveCount, len(svc.stubDriveHandler.drives), "The stub driver only knows stub drives")
})
}
}
Expand Down