*Updated Firecracker and return PID

plamenmpetrov · plamenmpetrov · commit ffdaba412b04 · 2021-06-18T20:15:48.000+03:00
*Removed patch drive from LoadSnapshot
*Now return the Firecracker PID in CreateVM's and LoadSnapshot's reponse
*Now return the path to the UPF socket in CreateVM instead of Offload

Signed-off-by: Plamen Petrov &lt;plamb0brt@gmail.com&gt;
diff --git a/_submodules/firecracker b/_submodules/firecracker
@@ -1 +1 @@
-Subproject commit eae0867b960fc924fffa98661e62b2171dd21412
+Subproject commit a0187963b3624b3958d39f95e6a4c1430a8c2b31
diff --git a/firecracker-control/local.go b/firecracker-control/local.go
@@ -652,7 +652,7 @@ func (s *local) CreateSnapshot(ctx context.Context, req *proto.CreateSnapshotReq
 }
 
 // LoadSnapshot Loads a snapshot of a VM
-func (s *local) LoadSnapshot(ctx context.Context, req *proto.LoadSnapshotRequest) (*empty.Empty, error) {
+func (s *local) LoadSnapshot(ctx context.Context, req *proto.LoadSnapshotRequest) (*proto.LoadResponse, error) {
 	client, err := s.shimFirecrackerClient(ctx, req.VMID)
 	if err != nil {
 		return nil, err
@@ -672,7 +672,7 @@ func (s *local) LoadSnapshot(ctx context.Context, req *proto.LoadSnapshotRequest
 // Offload Shuts down a VM started through the firecracker go sdk and deletes
 // the corresponding firecracker socket. All of the other resources (shim, other sockets)
 // will persist.
-func (s *local) Offload(ctx context.Context, req *proto.OffloadRequest) (*proto.OffloadResponse, error) {
+func (s *local) Offload(ctx context.Context, req *proto.OffloadRequest) (*empty.Empty, error) {
 	client, err := s.shimFirecrackerClient(ctx, req.VMID)
 	if err != nil {
 		return nil, err
diff --git a/firecracker-control/service.go b/firecracker-control/service.go
@@ -127,7 +127,7 @@ func (s *service) UpdateBalloonStats(ctx context.Context, req *proto.UpdateBallo
 	return s.local.UpdateBalloonStats(ctx, req)
 }
 
-func (s *service) LoadSnapshot(ctx context.Context, req *proto.LoadSnapshotRequest) (*empty.Empty, error) {
+func (s *service) LoadSnapshot(ctx context.Context, req *proto.LoadSnapshotRequest) (*proto.LoadResponse, error) {
 	log.G(ctx).Debugf("load snapshot request: %+v", req)
 	return s.local.LoadSnapshot(ctx, req)
 }
@@ -137,7 +137,7 @@ func (s *service) CreateSnapshot(ctx context.Context, req *proto.CreateSnapshotR
 	return s.local.CreateSnapshot(ctx, req)
 }
 
-func (s *service) Offload(ctx context.Context, req *proto.OffloadRequest) (*proto.OffloadResponse, error) {
+func (s *service) Offload(ctx context.Context, req *proto.OffloadRequest) (*empty.Empty, error) {
 	log.G(ctx).Debugf("offload request: %+v", req)
 	return s.local.Offload(ctx, req)
 }
diff --git a/go.sum b/go.sum
@@ -1084,6 +1084,8 @@ golang.org/x/tools v0.0.0-20200708183856-df98bc6d456c h1:Jt8nybBNSGn80qEV8fQLwCa
 golang.org/x/tools v0.0.0-20200708183856-df98bc6d456c/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200710042808-f1c4188a97a1 h1:rD1FcWVsRaMY+l8biE9jbWP5MS/CJJ/90a9TMkMgNrM=
 golang.org/x/tools v0.0.0-20200710042808-f1c4188a97a1/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d h1:szSOL78iTCl0LF1AMjhSWJj8tIM0KixlUUnBtYXsmd8=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 <<<<<<< HEAD
diff --git a/proto/firecracker.pb.go b/proto/firecracker.pb.go
diff --git a/proto/firecracker.proto b/proto/firecracker.proto
@@ -49,6 +49,8 @@ message CreateVMResponse {
     string LogFifoPath = 3;
     string MetricsFifoPath = 4;
     string CgroupPath = 5;
+    string UPFSockPath = 6;
+    string FirecrackerPID = 7;
 }
 
 message PauseVMRequest {
@@ -116,8 +118,8 @@ message LoadSnapshotRequest {
     bool EnableUserPF = 4;
 }
 
-message OffloadResponse {
-    string SendSockPath = 1;
+message LoadResponse {
+    string FirecrackerPID = 1;
 }
 
 message OffloadRequest {
diff --git a/proto/service/fccontrol/fccontrol.proto b/proto/service/fccontrol/fccontrol.proto
@@ -42,4 +42,13 @@ service Firecracker {
 
     // Updates a balloon device statistics polling interval.
     rpc UpdateBalloonStats(UpdateBalloonStatsRequest) returns(google.protobuf.Empty);
+
+    // Loads VM from snapshot
+    rpc LoadSnapshot(LoadSnapshotRequest) returns (LoadResponse);
+
+    // Make a snapshot of a VM
+    rpc CreateSnapshot(CreateSnapshotRequest) returns (google.protobuf.Empty);
+
+    // Offload a snapshotted VM
+    rpc Offload(OffloadRequest) returns (google.protobuf.Empty);
 }
diff --git a/proto/service/fccontrol/ttrpc/fccontrol.pb.go b/proto/service/fccontrol/ttrpc/fccontrol.pb.go
diff --git a/runtime/service.go b/runtime/service.go

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ func (s service) UpdateBalloonStats(ctx context.Context, req proto.UpdateBallo`
`127`	`127`	`return s.local.UpdateBalloonStats(ctx, req)`
`128`	`128`	`}`
`129`	`129`
`130`		`-func (s service) LoadSnapshot(ctx context.Context, req proto.LoadSnapshotRequest) (*empty.Empty, error) {`
	`130`	`+func (s service) LoadSnapshot(ctx context.Context, req proto.LoadSnapshotRequest) (*proto.LoadResponse, error) {`
`131`	`131`	`log.G(ctx).Debugf("load snapshot request: %+v", req)`
`132`	`132`	`return s.local.LoadSnapshot(ctx, req)`
`133`	`133`	`}`
`@@ -137,7 +137,7 @@ func (s service) CreateSnapshot(ctx context.Context, req proto.CreateSnapshotR`
`137`	`137`	`return s.local.CreateSnapshot(ctx, req)`
`138`	`138`	`}`
`139`	`139`
`140`		`-func (s service) Offload(ctx context.Context, req proto.OffloadRequest) (*proto.OffloadResponse, error) {`
	`140`	`+func (s service) Offload(ctx context.Context, req proto.OffloadRequest) (*empty.Empty, error) {`
`141`	`141`	`log.G(ctx).Debugf("offload request: %+v", req)`
`142`	`142`	`return s.local.Offload(ctx, req)`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ message CreateVMResponse {`
`49`	`49`	`string LogFifoPath = 3;`
`50`	`50`	`string MetricsFifoPath = 4;`
`51`	`51`	`string CgroupPath = 5;`
	`52`	`+ string UPFSockPath = 6;`
	`53`	`+ string FirecrackerPID = 7;`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`message PauseVMRequest {`
`@@ -116,8 +118,8 @@ message LoadSnapshotRequest {`
`116`	`118`	`bool EnableUserPF = 4;`
`117`	`119`	`}`
`118`	`120`
`119`		`-message OffloadResponse {`
`120`		`- string SendSockPath = 1;`
	`121`	`+message LoadResponse {`
	`122`	`+ string FirecrackerPID = 1;`
`121`	`123`	`}`
`122`	`124`
`123`	`125`	`message OffloadRequest {`