Environment variables

Signed-off-by: Diego Meyer <[email protected]>

Author: Diego Meyer

cri/firecracker/coordinator.go

@@ -30,8 +30,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/vhive-serverless/vhive/ctriface"
 	log "github.com/sirupsen/logrus"
+	"github.com/vhive-serverless/vhive/ctriface"
 )
 
 type coordinator struct {
@@ -99,12 +99,16 @@ func (c *coordinator) setIdleInstance(fi *funcInstance) {
 }
 
 func (c *coordinator) startVM(ctx context.Context, image string) (*funcInstance, error) {
+	return c.startVMWithEnvironment(ctx, image, []string{})
+}
+
+func (c *coordinator) startVMWithEnvironment(ctx context.Context, image string, environment []string) (*funcInstance, error) {
 	if fi := c.getIdleInstance(image); c.orch != nil && c.orch.GetSnapshotsEnabled() && fi != nil {
 		err := c.orchLoadInstance(ctx, fi)
 		return fi, err
 	}
 
-	return c.orchStartVM(ctx, image)
+	return c.orchStartVM(ctx, image, environment)
 }
 
 func (c *coordinator) stopVM(ctx context.Context, containerID string) error {
@@ -150,7 +154,7 @@ func (c *coordinator) insertActive(containerID string, fi *funcInstance) error {
 	return nil
 }
 
-func (c *coordinator) orchStartVM(ctx context.Context, image string) (*funcInstance, error) {
+func (c *coordinator) orchStartVM(ctx context.Context, image string, envVariables []string) (*funcInstance, error) {
 	vmID := strconv.Itoa(int(atomic.AddUint64(&c.nextID, 1)))
 	logger := log.WithFields(
 		log.Fields{
@@ -170,7 +174,7 @@ func (c *coordinator) orchStartVM(ctx context.Context, image string) (*funcInsta
 	defer cancel()
 
 	if !c.withoutOrchestrator {
-		resp, _, err = c.orch.StartVM(ctxTimeout, vmID, image)
+		resp, _, err = c.orch.StartVMWithEnvironment(ctxTimeout, vmID, image, envVariables)
 		if err != nil {
 			logger.WithError(err).Error("coordinator failed to start VM")
 		}

cri/firecracker/service.go

@@ -27,9 +27,9 @@ import (
 	"errors"
 	"sync"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/vhive-serverless/vhive/cri"
 	"github.com/vhive-serverless/vhive/ctriface"
-	log "github.com/sirupsen/logrus"
 	criapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 )
 
@@ -110,7 +110,8 @@ func (fs *FirecrackerService) createUserContainer(ctx context.Context, r *criapi
 		return nil, err
 	}
 
-	funcInst, err := fs.coordinator.startVM(context.Background(), guestImage)
+	environment := cri.ToStringArray(config.GetEnvs())
+	funcInst, err := fs.coordinator.startVMWithEnvironment(context.Background(), guestImage, environment)
 	if err != nil {
 		log.WithError(err).Error("failed to start VM")
 		return nil, err
@@ -127,12 +128,12 @@ func (fs *FirecrackerService) createUserContainer(ctx context.Context, r *criapi
 
 	// Wait for placeholder UC to be created
 	<-stockDone
-	
+
 	// Check for error from container creation
- 	if stockErr != nil {
- 		log.WithError(stockErr).Error("failed to create container")
- 		return nil, stockErr
- 	}
+	if stockErr != nil {
+		log.WithError(stockErr).Error("failed to create container")
+		return nil, stockErr
+	}
 
 	containerdID := stockResp.ContainerId
 	err = fs.coordinator.insertActive(containerdID, funcInst)
@@ -216,5 +217,4 @@ func getEnvVal(key string, config *criapi.ContainerConfig) (string, error) {
 	}
 
 	return "", errors.New("failed to provide non empty guest image in user container config")
-
 }

cri/gvisor/coordinator.go

@@ -83,7 +83,7 @@ func newCoordinator() (*coordinator, error) {
 	return c, nil
 }
 
-func (c *coordinator) startContainer(ctx context.Context, imageName string) (_ *gvContainer, retErr error) {
+func (c *coordinator) startContainer(ctx context.Context, imageName string, environment []string) (_ *gvContainer, retErr error) {
 	ctx = namespaces.WithNamespace(ctx, namespaceName)
 	ctrID := strconv.Itoa(int(atomic.AddUint64(&c.nextID, 1)))
 	image, err := c.getImage(ctx, imageName)
@@ -95,7 +95,10 @@ func (c *coordinator) startContainer(ctx context.Context, imageName string) (_ *
 		ctrID,
 		containerd.WithImage(*image),
 		containerd.WithNewSnapshot(ctrID, *image),
-		containerd.WithNewSpec(oci.WithImageConfig(*image)),
+		containerd.WithNewSpec(
+			oci.WithImageConfig(*image),
+			oci.WithEnv(environment),
+		),
 	)
 	if err != nil {
 		return nil, err

cri/gvisor/service.go

@@ -28,8 +28,8 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/vhive-serverless/vhive/cri"
 	log "github.com/sirupsen/logrus"
+	"github.com/vhive-serverless/vhive/cri"
 	criapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 )
 
@@ -108,7 +108,8 @@ func (gs *GVisorService) createUserContainer(ctx context.Context, r *criapi.Crea
 		return nil, err
 	}
 
-	ctr, err := gs.coor.startContainer(ctx, guestImage)
+	environment := cri.ToStringArray(config.GetEnvs())
+	ctr, err := gs.coor.startContainer(ctx, guestImage, environment)
 	if err != nil {
 		log.WithError(err).Error("failed to start container")
 		return nil, err

cri/util.go

@@ -0,0 +1,20 @@
+package cri
+
+import (
+	"fmt"
+	log "github.com/sirupsen/logrus"
+	criapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+)
+
+// (Key, Value) pair is mapped to a 'Key=Value' entry.
+func ToStringArray(envVariables []*criapi.KeyValue) []string {
+	result := make([]string, len(envVariables))
+
+	for _, kv := range envVariables {
+		env := fmt.Sprintf("%s=%s", kv.GetKey(), kv.GetValue())
+		result = append(result, env)
+	}
+
+	log.Debugf("Converted '%v' to '%v'\n", envVariables, result)
+	return result
+}

ctriface/iface.go

@@ -50,10 +50,10 @@ import (
 	_ "google.golang.org/grpc/codes"  //tmp
 	_ "google.golang.org/grpc/status" //tmp
 
+	"github.com/go-multierror/multierror"
 	"github.com/vhive-serverless/vhive/memory/manager"
 	"github.com/vhive-serverless/vhive/metrics"
 	"github.com/vhive-serverless/vhive/misc"
-	"github.com/go-multierror/multierror"
 
 	_ "github.com/davecgh/go-spew/spew" //tmp
 )
@@ -71,6 +71,10 @@ const (
 
 // StartVM Boots a VM if it does not exist
 func (o *Orchestrator) StartVM(ctx context.Context, vmID, imageName string) (_ *StartVMResponse, _ *metrics.Metric, retErr error) {
+	return o.StartVMWithEnvironment(ctx, vmID, imageName, []string{})
+}
+
+func (o *Orchestrator) StartVMWithEnvironment(ctx context.Context, vmID, imageName string, environmentVariables []string) (_ *StartVMResponse, _ *metrics.Metric, retErr error) {
 	var (
 		startVMMetric *metrics.Metric = metrics.NewMetric()
 		tStart        time.Time
@@ -128,6 +132,7 @@ func (o *Orchestrator) StartVM(ctx context.Context, vmID, imageName string) (_ *
 			oci.WithImageConfig(*vm.Image),
 			firecrackeroci.WithVMID(vmID),
 			firecrackeroci.WithVMNetwork,
+			oci.WithEnv(environmentVariables),
 		),
 		containerd.WithRuntime("aws.firecracker", nil),
 	)