Adapting Dandelion

Signed-off-by: Lazar Cvetković <l.cvetkovic.997@gmail.com>

Author: cvetkovic

cmd/worker_node/config.yaml

@@ -2,7 +2,7 @@ workerNodeIp: "127.0.0.1"
 controlPlaneAddress: "127.0.0.1:9090"
 port: "10010"
 verbosity: "trace"
-criType: "containerd"
+criType: "dandelion"
 cpuConstraints: false
 
 containerd:
@@ -19,8 +19,8 @@ firecracker:
   NetworkPoolSize: 4
 
 dandelion:
-  daemonPort: 8082
-  binaryPath: "configs/dandelion/sysld_wasm_x86_64_busy_loop"
+  daemonPort: 8083
+  binaryPath: "/home/lcvetkovic/projects/cluster_manager/configs/dandelion/sysld_wasm_x86_64_busy_loop"
   engineType: "Process"
   #binaryPath: "configs/dandelion/sysld_wasm_x86_64_matmul"
   #engineType: "RWasm"

cmd/worker_node/config_cluster.yaml

@@ -2,7 +2,7 @@ workerNodeIp: "dynamic"
 controlPlaneAddress: "10.0.1.2:9090"
 port: "10010"
 verbosity: "trace"
-criType: "containerd"
+criType: "dandelion"
 cpuConstraints: false
 
 containerd:

internal/worker_node/sandbox/dandelion/runtime.go

@@ -426,7 +426,7 @@ func (dr *Runtime) CreateSandbox(ctx context.Context, in *proto.ServiceInfo) (*p
 
 	if !ok {
 		// check if binary exists
-		binaryInfo, err := os.Stat(in.Image)
+		/*binaryInfo, err := os.Stat(in.Image)
 		if err != nil {
 			logrus.Errorf("Error validating binary file - %v", err)
 			return getFailureStatus(), nil
@@ -435,7 +435,7 @@ func (dr *Runtime) CreateSandbox(ctx context.Context, in *proto.ServiceInfo) (*p
 			logrus.Errorf("Error validating binary file - file is a directory")
 			return getFailureStatus(), nil
 		}
-		logrus.Infof("Registering binary file %s (size=%d)", in.Image, binaryInfo.Size())
+		logrus.Infof("Registering binary file %s (size=%d)", in.Image, binaryInfo.Size())*/
 
 		// operator load/store
 		fName := in.Name
@@ -460,14 +460,21 @@ func (dr *Runtime) CreateSandbox(ctx context.Context, in *proto.ServiceInfo) (*p
 		if dr.dandelionConfig.LogFunctionStdioOutset { // add "stdio" to get the stdio output from dandelion
 			outputSets = append(outputSets, "stdio")
 		}
+
+		binaryData, err := os.ReadFile(dr.dandelionConfig.BinaryPath)
+		if err != nil {
+			logrus.Errorf("Error reading binary file - %v", err)
+			return getFailureStatus(), nil
+		}
+
 		registerRequest := bson.D{
 			{Key: "name", Value: fName},
 			{Key: "context_size", Value: 0x8020000},
 			{Key: "engine_type", Value: dr.dandelionConfig.EngineType},
-			{Key: "local_path", Value: in.Image},
-			{Key: "binary", Value: bytesToInts([]byte{0})},
-			{Key: "input_sets", Value: inputSets},
-			{Key: "output_sets", Value: outputSets},
+			//{Key: "local_path", Value: in.Image},
+			{Key: "binary", Value: bytesToInts(binaryData)},
+			{Key: "input_sets", Value: bson.A{bson.A{"input", nil}}},
+			{Key: "output_sets", Value: []string{"output"}}, // add "stdio" for debugging purpose
 		}
 
 		// send registration request to dandelion

scripts/setup.cfg

@@ -13,9 +13,9 @@ DAEMONS_PER_NODE=1
 FIRECRACKER_VERSION="v1.7.0"
 # Local directory with Dandelion for finding the current remote tracking branch
 # Set to an empty string if you do not wish to clone Dandelion.
-DANDELION_DIR="" # $HOME/projects/dandelion
+DANDELION_DIR="$HOME/projects/dandelion"
 
 # Select the runtime to use: containerd, firecracker, dandelion, fcctr.
 # This should match criType in the worker node configuration, and determines
 # which tools to install during setup.
-RUNTIME="containerd"
+RUNTIME="dandelion"