Fix: function deletion not followed by container destruction in tests

Author: grussorusso

examples/inc.py

@@ -1,2 +1,3 @@
 def handler(params, context):
+    print(f"Invoked inc with input: {params}")
     return int(params["input"]) + 1

images/base-alpine/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine AS build
+FROM golang:1.21-alpine AS build
 
 WORKDIR /sedge
 

internal/container/container.go

@@ -68,9 +68,9 @@ func Execute(contID ContainerID, req *executor.InvocationRequest) (*executor.Inv
 	if resp.StatusCode != 200 {
 		buffer, err2 := io.ReadAll(resp.Body)
 		if err2 != nil {
-			return nil, waitDuration, fmt.Errorf("function invocation with params: %s failed with status %s: - can't get response buffer %v", postBodyB, resp.Status, err2)
+			return nil, waitDuration, fmt.Errorf("function invocation  %v failed with status %s: - can't get response buffer %v", req, resp.Status, err2)
 		}
-		return nil, waitDuration, fmt.Errorf("function invocation with params: %s failed with status %s: %s", postBodyB, resp.Status, buffer)
+		return nil, waitDuration, fmt.Errorf("function invocation %v failed with status %s: %s", req, resp.Status, buffer)
 	}
 	defer func(Body io.ReadCloser) {
 		err := Body.Close()

internal/container/docker.go

@@ -165,5 +165,5 @@ func (cf *DockerFactory) GetLog(contID ContainerID) (string, error) {
 	if err != nil {
 		return "no logs", fmt.Errorf("can't read the logs: %v", err)
 	}
-	return fmt.Sprintf("%s\n", logs), nil
+	return string(logs[:]), nil
 }

internal/scheduling/execution.go

@@ -3,6 +3,7 @@ package scheduling
 import (
 	"fmt"
 	"github.com/serverledge-faas/serverledge/internal/function"
+	"log"
 	"time"
 
 	"github.com/serverledge-faas/serverledge/internal/container"
@@ -13,7 +14,8 @@ const HANDLER_DIR = "/app"
 
 // Execute serves a request on the specified container.
 func Execute(contID container.ContainerID, r *scheduledRequest, isWarm bool) (function.ExecutionReport, error) {
-	//log.Printf("[%s] Executing on container: %v", r.Fun, contID)
+
+	log.Printf("[%s] Executing on container: %v", r.Fun, contID)
 
 	var req executor.InvocationRequest
 	if r.Fun.Runtime == container.CUSTOM_RUNTIME {
@@ -38,14 +40,20 @@ func Execute(contID container.ContainerID, r *scheduledRequest, isWarm bool) (fu
 	response, invocationWait, err := container.Execute(contID, &req)
 
 	if err != nil {
+		logs, errLog := container.GetLog(contID)
+		if errLog == nil {
+			fmt.Println(logs)
+		} else {
+			fmt.Printf("Failed to get log: %v\n", errLog)
+		}
+
 		// notify scheduler
 		completions <- &completionNotification{fun: r.Fun, contID: contID, executionReport: nil}
-		return function.ExecutionReport{}, fmt.Errorf("[%s] Execution failed: %v", r, err)
+		return function.ExecutionReport{}, fmt.Errorf("[%s] Execution failed on container %v: %v ", r, contID, err)
 	}
 
 	if !response.Success {
 		// notify scheduler
-		//TODO: logs, errLogs := container.GetLog(contID)
 		completions <- &completionNotification{fun: r.Fun, contID: contID, executionReport: nil}
 		return function.ExecutionReport{}, fmt.Errorf("Function execution failed")
 	}

internal/test/api_test.go

@@ -63,6 +63,11 @@ func TestCreateWorkflow(t *testing.T) {
 		t.Skip("Skipping integration test")
 	}
 	fcName := "sequence"
+	oldW, found := workflow.Get(fcName)
+	if found {
+		oldW.Delete()
+	}
+
 	fn, err := InitializePyFunction("inc", "handler", function.NewSignature().
 		AddInput("input", function.Int{}).
 		AddOutput("result", function.Int{}).

internal/test/util.go

@@ -4,6 +4,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"github.com/serverledge-faas/serverledge/internal/node"
 	"net/http"
 	"os"
 	"testing"
@@ -19,6 +20,13 @@ const PY_MEMORY = 20
 const JS_MEMORY = 50
 
 func initializeExamplePyFunction() (*function.Function, error) {
+	oldF, found := function.GetFunction("inc")
+	if found {
+		// the function already exists; we delete it
+		oldF.Delete()
+		node.ShutdownWarmContainersFor(oldF)
+	}
+
 	srcPath := "../../examples/inc.py"
 	srcContent, err := cli.ReadSourcesAsTar(srcPath)
 	if err != nil {
@@ -43,6 +51,13 @@ func initializeExamplePyFunction() (*function.Function, error) {
 }
 
 func initializeExampleJSFunction() (*function.Function, error) {
+	oldF, found := function.GetFunction("inc")
+	if found {
+		// the function already exists; we delete it
+		oldF.Delete()
+		node.ShutdownWarmContainersFor(oldF)
+	}
+
 	srcPath := "../../examples/inc.js"
 	srcContent, err := cli.ReadSourcesAsTar(srcPath)
 	if err != nil {
@@ -66,6 +81,14 @@ func initializeExampleJSFunction() (*function.Function, error) {
 }
 
 func InitializePyFunction(name string, handler string, sign *function.Signature) (*function.Function, error) {
+
+	oldF, found := function.GetFunction(name)
+	if found {
+		// the function already exists; we delete it
+		oldF.Delete()
+		node.ShutdownWarmContainersFor(oldF)
+	}
+
 	srcPath := "../../examples/" + name + ".py"
 	srcContent, err := cli.ReadSourcesAsTar(srcPath)
 	if err != nil {
@@ -86,6 +109,13 @@ func InitializePyFunction(name string, handler string, sign *function.Signature)
 }
 
 func initializeJsFunction(name string, sign *function.Signature) (*function.Function, error) {
+	oldF, found := function.GetFunction(name)
+	if found {
+		// the function already exists; we delete it
+		oldF.Delete()
+		node.ShutdownWarmContainersFor(oldF)
+	}
+
 	srcPath := "../../examples/" + name + ".js"
 	srcContent, err := cli.ReadSourcesAsTar(srcPath)
 	if err != nil {

internal/workflow/scheduler.go

@@ -1,6 +1,7 @@
 package workflow
 
 import (
+	"log"
 	"time"
 
 	"github.com/serverledge-faas/serverledge/internal/function"
@@ -20,6 +21,7 @@ func SubmitWorkflowInvocationRequest(req *Request) error {
 func SubmitAsyncWorkflowInvocationRequest(req *Request) {
 	executionReport, errInvoke := req.W.Invoke(req)
 	if errInvoke != nil {
+		log.Println(errInvoke)
 		PublishAsyncInvocationResponse(req.Id, InvocationResponse{Success: false})
 		return
 	}