wip

beam-cloud · Oct 25, 2024 · 6ddff52 · 6ddff52
1 parent 1dbf35b
commit 6ddff52
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/worker/cedana.go b/pkg/worker/cedana.go
@@ -220,7 +220,7 @@ func (c *CedanaClient) Checkpoint(ctx context.Context, containerId string) error
 }
 
 // Restore a runc container
-func (c *CedanaClient) Restore(ctx context.Context, containerId string) (*api.ProcessState, error) {
+func (c *CedanaClient) Restore(ctx context.Context, containerId, bundlePath string) (*api.ProcessState, error) {
 	ctx, cancel := context.WithTimeout(ctx, defaultCheckpointDeadline)
 	defer cancel()
 
@@ -229,7 +229,9 @@ func (c *CedanaClient) Restore(ctx context.Context, containerId string) (*api.Pr
 		Type:     api.CRType_LOCAL,
 		JID:      containerId,
 		CriuOpts: &api.CriuOpts{TcpEstablished: true},
-		RuncOpts: &api.RuncOpts{},
+		RuncOpts: &api.RuncOpts{
+			Bundle: bundlePath,
+		},
 		// Need option to override overlay FD
 	}
 	res, err := c.service.JobRestore(ctx, args)

diff --git a/pkg/worker/lifecycle.go b/pkg/worker/lifecycle.go
@@ -502,7 +502,7 @@ func (s *Worker) spawn(request *types.ContainerRequest, spec *specs.Spec, output
 		if createCheckpoint {
 			go s.createCheckpoint(ctx, request)
 		} else if state.Status == types.CheckpointStatusAvailable {
-			processState, err := s.cedanaClient.Restore(ctx, state.ContainerId)
+			processState, err := s.cedanaClient.Restore(ctx, state.ContainerId, opts.BundlePath)
 			if err != nil {
 				log.Printf("<%s> - failed to restore checkpoint: %v\n", request.ContainerId, err)