Avoid passing pointer to Request in completionNotification

Author: grussorusso

internal/scheduling/execution.go

@@ -47,13 +47,13 @@ func Execute(cont *container.Container, r *scheduledRequest, isWarm bool) error
 		}
 
 		// notify scheduler
-		completions <- &completionNotification{r: r, cont: cont, failed: true}
+		completions <- &completionNotification{funcName: r.Fun.Name, offloaded: r.offloaded, cont: cont, failed: true}
 		return fmt.Errorf("[%s] Execution failed on container %v: %v ", r, cont.ID, err)
 	}
 
 	if !response.Success {
 		// notify scheduler
-		completions <- &completionNotification{r: r, cont: cont, failed: true}
+		completions <- &completionNotification{funcName: r.Fun.Name, offloaded: r.offloaded, cont: cont, failed: true}
 		return fmt.Errorf("[%s] Function execution failed %v", r, cont.ID)
 	}
 
@@ -66,7 +66,7 @@ func Execute(cont *container.Container, r *scheduledRequest, isWarm bool) error
 	r.InitTime = initTime + invocationWait.Seconds()
 
 	// notify scheduler
-	completions <- &completionNotification{r: r, cont: cont, failed: false}
+	completions <- &completionNotification{funcName: r.Fun.Name, offloaded: r.offloaded, report: *r.ExecutionReport, cont: cont, failed: false}
 
 	return nil
 }

internal/scheduling/scheduler.go

@@ -53,18 +53,23 @@ func Run(p Policy) {
 		case r = <-requests: // receive request
 			go p.OnArrival(r)
 		case c = <-completions:
-			node.HandleCompletion(c.cont, c.r.Fun)
-			p.OnCompletion(c.r.Fun, c.r.ExecutionReport)
-
-			if metrics.Enabled && !c.failed && c.r.ExecutionReport != nil {
-				metrics.AddCompletedInvocation(c.r.Fun.Name, !c.r.ExecutionReport.IsWarmStart)
-				if !c.r.offloaded {
-					metrics.AddFunctionDurationValue(c.r.Fun.Name, c.r.ExecutionReport.Duration)
-					if !c.r.ExecutionReport.IsWarmStart {
-						metrics.AddFunctionInitTimeValue(c.r.Fun.Name, c.r.ExecutionReport.InitTime)
+			f, found := function.GetFunction(c.funcName)
+			if !found {
+				log.Printf("Function %s not found", c.funcName)
+				continue
+			}
+			node.HandleCompletion(c.cont, f)
+			p.OnCompletion(f, &c.report)
+
+			if metrics.Enabled && !c.failed {
+				metrics.AddCompletedInvocation(c.funcName, !c.report.IsWarmStart)
+				if !c.offloaded {
+					metrics.AddFunctionDurationValue(c.funcName, c.report.Duration)
+					if !c.report.IsWarmStart {
+						metrics.AddFunctionInitTimeValue(c.funcName, c.report.InitTime)
 					}
 				}
-				outputSize := len(c.r.ExecutionReport.Result)
+				outputSize := len(c.report.Result)
 				metrics.AddFunctionOutputSizeValue(r.Fun.Name, float64(outputSize))
 			}
 		}

internal/scheduling/types.go

@@ -14,9 +14,11 @@ type scheduledRequest struct {
 }
 
 type completionNotification struct {
-	failed bool
-	r      *scheduledRequest
-	cont   *container.Container
+	failed    bool
+	funcName  string
+	offloaded bool
+	report    function.ExecutionReport
+	cont      *container.Container
 }
 
 // schedDecision wraps a action made by the scheduler.