faas-rs/faasd
1
0
Fork 0
mirror of https://github.com/openfaas/faasd.git synced 2025-06-21 00:06:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure scaling up from zero works in faasd CE

Browse Source 
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis (OpenFaaS Ltd)
2024-09-18 15:45:13 +01:00
parent e59e3f0cb6
commit 5344a32472
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/provider/handlers/scale.go
View File

@ -96,32 +96,24 @@ func MakeReplicaUpdateHandler(client *containerd.Client, cni gocni.CNI) func(w h
createNewTask := false createNewTask := false
// Scale to zero
if req.Replicas == 0 { if req.Replicas == 0 {
// If a task is running, pause it http.Error(w, "replicas must > 0 for faasd CE", http.StatusBadRequest)
if taskExists && taskStatus.Status == containerd.Running { return
if pauseErr := task.Pause(ctx); pauseErr != nil {
wrappedPauseErr := fmt.Errorf("error pausing task %s, error: %s", name, pauseErr)
log.Printf("[Scale] %s\n", wrappedPauseErr.Error())
http.Error(w, wrappedPauseErr.Error(), http.StatusNotFound)
return
}
}
} }
if taskExists { if taskExists {
if taskStatus != nil { if taskStatus != nil {
if taskStatus.Status == containerd.Paused { if taskStatus.Status == containerd.Paused {
if resumeErr := task.Resume(ctx); resumeErr != nil { if _, err := task.Delete(ctx); err != nil {
log.Printf("[Scale] error resuming task %s, error: %s\n", name, resumeErr) log.Printf("[Scale] error deleting paused task %s, error: %s\n", name, err)
http.Error(w, resumeErr.Error(), http.StatusBadRequest) http.Error(w, err.Error(), http.StatusBadRequest)
return return
} }
} else if taskStatus.Status == containerd.Stopped { } else if taskStatus.Status == containerd.Stopped {
// Stopped tasks cannot be restarted, must be removed, and created again // Stopped tasks cannot be restarted, must be removed, and created again
if _, delErr := task.Delete(ctx); delErr != nil { if _, err := task.Delete(ctx); err != nil {
log.Printf("[Scale] error deleting stopped task %s, error: %s\n", name, delErr) log.Printf("[Scale] error deleting stopped task %s, error: %s\n", name, err)
http.Error(w, delErr.Error(), http.StatusBadRequest) http.Error(w, err.Error(), http.StatusBadRequest)
return return
} }
createNewTask = true createNewTask = true