add compatibility with offloading

Signed-off-by: Amory Hoste <[email protected]>
vhive-serverless · Mar 21, 2022 · 6d3265d · 6d3265d
1 parent aff3d2b
commit 6d3265d
Show file tree

Hide file tree

Showing 6 changed files with 129 additions and 106 deletions.
diff --git a/firecracker-control/local.go b/firecracker-control/local.go
@@ -633,10 +633,12 @@ func (s *local) CreateSnapshot(ctx context.Context, req *proto.CreateSnapshotReq
 func (s *local) LoadSnapshot(ctx context.Context, req *proto.LoadSnapshotRequest) (*proto.LoadResponse, error) {
 	var err error
 
-	// Create shim if not exists yet
-	code, err := s.CreateShim(ctx, req.GetVMID())
-	if err != nil && code != codes.AlreadyExists {
-		return nil, err
+	// Create shim if not exists yet for non-offloaded snapshots
+	if ! req.Offloaded {
+		code, err := s.CreateShim(ctx, req.GetVMID())
+		if err != nil && code != codes.AlreadyExists {
+			return nil, err
+		}
 	}
 
 	client, err := s.shimFirecrackerClient(ctx, req.VMID)

diff --git a/proto/events.pb.go b/proto/events.pb.go
diff --git a/proto/firecracker.pb.go b/proto/firecracker.pb.go
diff --git a/proto/firecracker.proto b/proto/firecracker.proto
@@ -43,6 +43,7 @@ message CreateVMRequest {
     FirecrackerBalloonDevice BalloonDevice = 14;
 
     string NetworkNamespace = 15;
+    bool OffloadEnabled = 16;
 }
 
 message CreateVMResponse {
@@ -121,6 +122,7 @@ message LoadSnapshotRequest {
     bool EnableUserPF = 4;
     string NetworkNamespace = 5;
     string NewSnapshotPath = 6;
+    bool Offloaded = 7;
 }
 
 message LoadResponse {

diff --git a/runtime/helpers.go b/runtime/helpers.go
@@ -123,6 +123,10 @@ func networkConfigFromProto(nwIface *proto.FirecrackerNetworkInterface, vmID str
 // netNSFromProto returns the name and handle of the network namespace set, if any in the protobuf
 // message.
 func netNSFromProto(request *proto.CreateVMRequest) (string, ns.NetNS) {
+	if request.NetworkNamespace == "" {
+		return "", nil
+	}
+
 	if request != nil {
 		netNS, err := ns.GetNS(request.NetworkNamespace)
 		if err != nil {
@@ -138,6 +142,10 @@ func netNSFromProto(request *proto.CreateVMRequest) (string, ns.NetNS) {
 // netNSFromProto returns the name and handle of the network namespace set, if any in the protobuf
 // message.
 func netNSFromSnapRequest(request *proto.LoadSnapshotRequest) (string, ns.NetNS) {
+	if request.NetworkNamespace == "" {
+		return "", nil
+	}
+
 	if request != nil {
 		netNS, err := ns.GetNS(request.NetworkNamespace)
 		if err != nil {