From 129dda0bab86449dcd142f4540e37f15469b64ad Mon Sep 17 00:00:00 2001
From: Luiz Aoqui <luiz@hashicorp.com>
Date: Fri, 24 Mar 2023 19:01:20 -0400
Subject: [PATCH] scheduler: remove `filterByFailedReconnect` method

Since we are now already iterating over the reconnecting allocations in
a specific method having a separate loop to find failed allocations is
unnecessary.
---
 scheduler/reconcile.go      | 25 +++++++++++++++++--------
 scheduler/reconcile_util.go | 13 -------------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/scheduler/reconcile.go b/scheduler/reconcile.go
index 458a48b2545d..54b434eec59b 100644
--- a/scheduler/reconcile.go
+++ b/scheduler/reconcile.go
@@ -1078,13 +1078,21 @@ func (a *allocReconciler) reconcileReconnecting(reconnecting allocSet, others al
 	stop := make(allocSet)
 	reconnect := make(allocSet)
 
-	// Mark all failed reconnects for stop.
-	failedReconnects := reconnecting.filterByFailedReconnect()
-	stop = stop.union(failedReconnects)
-	a.markStop(failedReconnects, structs.AllocClientStatusFailed, allocRescheduled)
-	successfulReconnects := reconnecting.difference(failedReconnects)
+	for _, reconnectingAlloc := range reconnecting {
+		// Stop allocations that failed to reconnect.
+		reconnectFailed := !reconnectingAlloc.ServerTerminalStatus() &&
+			reconnectingAlloc.ClientStatus == structs.AllocClientStatusFailed
+
+		if reconnectFailed {
+			stop[reconnectingAlloc.ID] = reconnectingAlloc
+			a.result.stop = append(a.result.stop, allocStopResult{
+				alloc:             reconnectingAlloc,
+				clientStatus:      structs.AllocClientStatusFailed,
+				statusDescription: allocRescheduled,
+			})
+			continue
+		}
 
-	for _, reconnectingAlloc := range successfulReconnects {
 		// If the desired status is not run, or if the user-specified desired
 		// transition is not run, stop the reconnecting allocation.
 		stopReconnecting := reconnectingAlloc.DesiredStatus != structs.AllocDesiredStatusRun ||
@@ -1106,6 +1114,7 @@ func (a *allocReconciler) reconcileReconnecting(reconnecting allocSet, others al
 		// Find replacement allocations and decide which one to stop. A
 		// reconnecting allocation may have multiple replacements.
 		for _, replacementAlloc := range others {
+
 			// Skip allocations that are not a replacement of the one
 			// reconnecting. Replacement allocations have the same name but a
 			// higher CreateIndex and a different ID.
@@ -1116,7 +1125,7 @@ func (a *allocReconciler) reconcileReconnecting(reconnecting allocSet, others al
 			// Skip allocations that are server terminal.
 			// We don't want to replace a reconnecting allocation with one that
 			// is or will terminate and we don't need to stop them since they
-			// are marked as terminal by the servers.
+			// are already marked as terminal by the servers.
 			if !isReplacement || replacementAlloc.ServerTerminalStatus() {
 				continue
 			}
@@ -1146,7 +1155,7 @@ func (a *allocReconciler) reconcileReconnecting(reconnecting allocSet, others al
 	}
 
 	// Any reconnecting allocation not set to stop must be reconnected.
-	for _, alloc := range successfulReconnects {
+	for _, alloc := range reconnecting {
 		if _, ok := stop[alloc.ID]; !ok {
 			reconnect[alloc.ID] = alloc
 		}
diff --git a/scheduler/reconcile_util.go b/scheduler/reconcile_util.go
index 42e8fb8cd6b5..c080481b0c87 100644
--- a/scheduler/reconcile_util.go
+++ b/scheduler/reconcile_util.go
@@ -520,19 +520,6 @@ func (a allocSet) filterByDeployment(id string) (match, nonmatch allocSet) {
 	return
 }
 
-// filterByFailedReconnect filters allocation into a set that have failed on the
-// client but do not have a terminal status at the server so that they can be
-// marked as stop at the server.
-func (a allocSet) filterByFailedReconnect() allocSet {
-	failed := make(allocSet)
-	for _, alloc := range a {
-		if !alloc.ServerTerminalStatus() && alloc.ClientStatus == structs.AllocClientStatusFailed {
-			failed[alloc.ID] = alloc
-		}
-	}
-	return failed
-}
-
 // delayByStopAfterClientDisconnect returns a delay for any lost allocation that's got a
 // stop_after_client_disconnect configured
 func (a allocSet) delayByStopAfterClientDisconnect() (later []*delayedRescheduleInfo) {