Fix: don't try dequeueing a request more than once

Author: grussorusso

internal/node/node.go

@@ -47,7 +47,7 @@ func (n *Resources) Init() {
 }
 
 func (n *Resources) String() string {
-	return fmt.Sprintf("[CPUs: %f/%f - Mem: %d(%d warm)/%d]", n.usedCPUs, n.totalCPUs, n.busyPoolUsedMem, n.warmPoolUsedMem, n.totalMemory)
+	return fmt.Sprintf("[CPUs: %f/%f - Mem: %d(+%d warm)/%d]", n.usedCPUs, n.totalCPUs, n.busyPoolUsedMem, n.warmPoolUsedMem, n.totalMemory)
 }
 
 func (n *Resources) FreeMemory() int64 {

internal/node/pool.go

@@ -269,17 +269,16 @@ func dismissContainer(requiredMemoryMB int64) (bool, error) {
 			// every container into the funPool has the same memory (same function)
 			//so it is not important which one you destroy
 			elem := funPool.idle.Front()
-			contID := elem.Value.(*container.Container).ID
 			// container in the same pool need same memory
-			memory, _ := container.GetMemoryMB(contID)
-			for ok := true; ok; ok = elem != nil {
-				containerToDismiss = append(containerToDismiss,
-					itemToDismiss{contID: contID, pool: funPool, elem: elem, memory: memory})
+			memory, _ := container.GetMemoryMB(elem.Value.(*container.Container).ID)
+
+			for elem != nil {
+				contID := elem.Value.(*container.Container).ID
+				containerToDismiss = append(containerToDismiss, itemToDismiss{contID: contID, pool: funPool, elem: elem, memory: memory})
 				cleanedMB += memory
 				if cleanedMB >= requiredMemoryMB {
 					goto cleanup
 				}
-				//go on to the next one
 				elem = elem.Next()
 			}
 		}
@@ -317,7 +316,6 @@ func DeleteExpiredContainer() {
 			if now > warm.ExpirationTime {
 				temp := elem
 				elem = elem.Next()
-				//log.Printf("cleaner: Removing container %s\n", warm.contID)
 				pool.idle.Remove(temp) // remove the expired element
 
 				memory, _ := container.GetMemoryMB(warm.ID)
@@ -326,13 +324,11 @@ func DeleteExpiredContainer() {
 				if err != nil {
 					log.Printf("Error while destroying container %s: %s\n", warm.ID, err)
 				}
-				// log.Printf("Released resources. Now: %v\n", &LocalResources)
 			} else {
 				elem = elem.Next()
 			}
 		}
 	}
-
 }
 
 // ShutdownWarmContainersFor destroys warm containers of a given function

internal/scheduling/policy_default.go

@@ -60,6 +60,8 @@ func (p *DefaultLocalPolicy) OnCompletion(_ *function.Function, _ *function.Exec
 				}, func(e error) {
 					dropRequest(req)
 				})
+			} else {
+				tryDequeueing = false
 			}
 		} else if errors.Is(err, node.OutOfResourcesErr) {
 			tryDequeueing = false