Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of scheduler: fix reconciliation of reconnecting allocs into release/1.5.x #16647

Merged
merged 7 commits into from
Mar 24, 2023
Merged

Backport of scheduler: fix reconciliation of reconnecting allocs into release/1.5.x #16647

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
78a90d3
backport of commit 7e334ff921b8041291757a3deb47ac381191c5e4
lgfa29 Mar 21, 2023
f7c8e82
backport of commit 3ab49e9748729dcb2050336579b9c92a292c1b34
lgfa29 Mar 22, 2023
8b42428
backport of commit a87af841d42ccfb76d7b14717fb389b8c169fda0
lgfa29 Mar 22, 2023
5bc2205
backport of commit 66241b86882ee870bfece14ded23229c712fadea
lgfa29 Mar 22, 2023
cda190e
backport of commit f88c15add0efbe2edaa45bc4610e3790131cd580
lgfa29 Mar 23, 2023
395ccfa
backport of commit 0b97e34fcf3ef784709b25307ce1c4015015dc59
lgfa29 Mar 23, 2023
6c528b9
backport of commit 129dda0bab86449dcd142f4540e37f15469b64ad
lgfa29 Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
backport of commit f88c15a
  • Loading branch information
@lgfa29
lgfa29 committed Mar 23, 2023
commit cda190e723b2a339b43b3db9eb9a7826b3b514c1
2 changes: 1 addition & 1 deletion scheduler/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ func (a *allocReconciler) computeGroup(groupName string, all allocSet) bool {
// their replacements first because there is specific logic when deciding
// which ones to keep that can only be applied when the client reconnects.
if len(reconnecting) > 0 {
// Pass all allocations becasue the replacements we need to find may be
// Pass all allocations because the replacements we need to find may be
// in any state, including themselves being reconnected.
reconnect, stop := a.reconcileReconnecting(reconnecting, all)

Expand Down