*Updated Firecracker and return PID

	*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 <[email protected]>

Author: plamenmpetrov

_submodules/firecracker

@@ -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

firecracker-control/local.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)
 }

firecracker-control/service.go

@@ -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 {

proto/firecracker.pb.go

@@ -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);
 }