fixup! Adds cgroup path to CreateVMResponse

Signed-off-by: xibz <[email protected]>

Author: xibz

proto/firecracker.pb.go

@@ -38,11 +38,10 @@ message CreateVMRequest {
 
 message CreateVMResponse {
     string VMID = 1;
-    uint32 ContextID = 2;
-    string SocketPath = 3;
-    string LogFifoPath = 4;
-    string MetricsFifoPath = 5;
-    string CgroupPath = 6;
+    string SocketPath = 2;
+    string LogFifoPath = 3;
+    string MetricsFifoPath = 4;
+    string CgroupPath = 5;
 }
 
 message StopVMRequest {
@@ -56,11 +55,10 @@ message GetVMInfoRequest {
 
 message GetVMInfoResponse {
     string VMID = 1;
-    uint32 ContextID = 2;
-    string SocketPath = 3;
-    string LogFifoPath = 4;
-    string MetricsFifoPath = 5;
-    string CgroupPath = 6;
+    string SocketPath = 2;
+    string LogFifoPath = 3;
+    string MetricsFifoPath = 4;
+    string CgroupPath = 5;
 }
 
 message SetVMMetadataRequest {

proto/firecracker.proto

@@ -77,5 +77,13 @@ func newJailer(
 	}
 
 	l := logger.WithField("jailer", "runc")
-	return newRuncJailer(ctx, l, ociBundlePath, service, jailerUID, jailerGID)
+	return newRuncJailer(
+		ctx,
+		l,
+		service.vmID,
+		ociBundlePath,
+		service.config.JailerConfig.RuncBinaryPath,
+		jailerUID,
+		jailerGID,
+	)
 }

runtime/jailer.go

@@ -77,8 +77,3 @@ func (j noopJailer) StubDrivesOptions() []stubDrivesOpt {
 	j.logger.Debug("noop operation for StubDrivesOptions")
 	return []stubDrivesOpt{}
 }
-
-func (j noopJailer) CgroupPath() string {
-	j.logger.Debug("noop operation for CgroupPath")
-	return ""
-}

runtime/noop_jailer.go

@@ -56,18 +56,23 @@ type runcJailer struct {
 
 const firecrackerFileName = "firecracker"
 
-func newRuncJailer(ctx context.Context, logger *logrus.Entry, ociBundlePath string, service *service, uid, gid uint32) (*runcJailer, error) {
-	l := logger.WithField("ociBundlePath", ociBundlePath).
-		WithField("runcBinaryPath", service.config.JailerConfig.RuncBinaryPath)
-
+func newRuncJailer(
+	ctx context.Context,
+	logger *logrus.Entry,
+	vmID string,
+	ociBundlePath string,
+	runcBinaryPath string,
+	uid uint32,
+	gid uint32) (*runcJailer, error) {
+	l := logger.WithField("ociBundlePath", ociBundlePath).WithField("runcBinaryPath", runcBinaryPath)
 	j := &runcJailer{
 		ctx:            ctx,
 		logger:         l,
 		ociBundlePath:  ociBundlePath,
-		runcBinaryPath: service.config.JailerConfig.RuncBinaryPath,
+		runcBinaryPath: runcBinaryPath,
 		uid:            uid,
 		gid:            gid,
-		vmID:           service.vmID,
+		vmID:           vmID,
 	}
 
 	spec := specs.Spec{}
@@ -442,7 +447,9 @@ func (j *runcJailer) setDefaultConfigValues(cfg *Config, socketPath string, spec
 		spec.Process.Args = cmd.Args
 	}
 
-	spec.Linux.CgroupsPath = j.CgroupPath()
+	cgroupPath := j.CgroupPath()
+	j.logger.WithField("CgroupPath", cgroupPath).Debug("using cgroup path")
+	spec.Linux.CgroupsPath = cgroupPath
 
 	return spec
 }

runtime/runc_jailer.go

@@ -53,12 +53,8 @@ func TestBuildJailedRootHandler_Isolated(t *testing.T) {
 	defer firecrackerFd.Close()
 
 	l := logrus.NewEntry(logrus.New())
-	s := &service{
-		config: &Config{
-			JailerConfig: JailerConfig{},
-		},
-	}
-	jailer, err := newRuncJailer(context.Background(), l, dir, s, 123, 456)
+	vmID := "foo"
+	jailer, err := newRuncJailer(context.Background(), l, vmID, dir, "path/to/runc", 123, 456)
 	require.NoError(t, err, "failed to create runc jailer")
 
 	cfg := Config{

runtime/runc_jailer_test.go

@@ -410,6 +410,7 @@ func TestMultipleVMs_Isolated(t *testing.T) {
 						require.NoError(t, err, "failed to stat root path of jailer")
 						_, err = os.Stat(filepath.Join("/sys/fs/cgroup/cpu", resp.CgroupPath))
 						require.NoError(t, err, "failed to stat cgroup path of jailer")
+						assert.Equal(t, filepath.Join("/firecracker-containerd", vmIDStr), resp.CgroupPath)
 					}
 
 					// Verify each exec had the same stdout and use that value as the mount namespace that will be compared