Skip to content

fix: preserve order of node reports in healthcheck #10835

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

Merged
merged 2 commits into from
Nov 22, 2023
Merged

fix: preserve order of node reports in healthcheck #10835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0af7f2
fix: preserve order of node reports in healthcheck
mtojek Nov 22, 2023
3dcdb3e
sort in place
mtojek Nov 22, 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
13 changes: 13 additions & 0 deletions coderd/healthcheck/derphealth/derp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"sync/atomic"
"time"

"golang.org/x/exp/slices"
"golang.org/x/xerrors"
"tailscale.com/derp"
"tailscale.com/derp/derphttp"
Expand All @@ -22,6 +23,7 @@ import (
tslogger "tailscale.com/types/logger"

"github.com/coder/coder/v2/coderd/util/ptr"
"github.com/coder/coder/v2/coderd/util/slice"
)

const (
Expand Down Expand Up @@ -183,6 +185,11 @@ func (r *RegionReport) Run(ctx context.Context) {
}
wg.Wait()

r.mu.Lock()
defer r.mu.Unlock()

sortNodeReports(r.NodeReports)

// Coder allows for 1 unhealthy node in the region, unless there is only 1 node.
if len(r.Region.Nodes) == 1 {
r.Healthy = healthyNodes == len(r.Region.Nodes)
Expand Down Expand Up @@ -492,3 +499,9 @@ func convertError(err error) *string {

return nil
}

func sortNodeReports(reports []*NodeReport) {
slices.SortFunc(reports, func(a, b *NodeReport) int {
return slice.Ascending(a.Node.Name, b.Node.Name)
})
}
1 change: 0 additions & 1 deletion coderd/healthcheck/derphealth/derp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ func TestDERP(t *testing.T) {

t.Run("HealthyWithNodeDegraded", func(t *testing.T) {
t.Parallel()
t.Skip("https://github.com/coder/coder/issues/10824")

healthyDerpSrv := derp.NewServer(key.NewNode(), func(format string, args ...any) { t.Logf(format, args...) })
defer healthyDerpSrv.Close()
Expand Down