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

core: merge reserved_ports into host_networks #13651

Merged
merged 13 commits into from
Jul 12, 2022
Merged

core: merge reserved_ports into host_networks #13651

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d1b652c
core: merge reserved_ports into host_networks
schmichael Jul 8, 2022
30584d4
Get structs tests passing
schmichael Jul 8, 2022
2a1b420
Add more complete unit test
schmichael Jul 11, 2022
2bb1c4e
Simply getProperty further
schmichael Jul 11, 2022
462fa16
Fix tests to match new API + behavior
schmichael Jul 11, 2022
5a08ca3
Test invalid node path
schmichael Jul 11, 2022
ffdcd60
Add a changelog entry
schmichael Jul 11, 2022
68709dd
Remove embarrassing git miscommits
schmichael Jul 12, 2022
f9042dc
Remove must
schmichael Jul 12, 2022
1b497b8
Fix typo on website/content/docs/configuration/client.mdx
schmichael Jul 12, 2022
bdd2d86
Expand NetworkIndex struct comments
schmichael Jul 12, 2022
83b31f4
More comment fixing
schmichael Jul 12, 2022
7fdcd6f
Tests should probably at least compile
schmichael Jul 12, 2022
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
11 changes: 9 additions & 2 deletions nomad/structs/funcs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,11 @@ func AllocsFit(node *Node, allocs []*Allocation, netIdx *NetworkIndex, checkDevi
netIdx = NewNetworkIndex()
defer netIdx.Release()

if collision, reason := netIdx.SetNode(node); collision {
return false, fmt.Sprintf("reserved node port collision: %v", reason), used, nil
if err := netIdx.SetNode(node); err != nil {
// To maintain backward compatibility with when SetNode
// returned collision+reason like AddAllocs, return
// this as a reason instead of an error.
return false, fmt.Sprintf("reserved node port collision: %v", err), used, nil
}
if collision, reason := netIdx.AddAllocs(allocs); collision {
return false, fmt.Sprintf("reserved alloc port collision: %v", reason), used, nil
Expand Down Expand Up @@ -530,6 +533,10 @@ func ParsePortRanges(spec string) ([]uint64, error) {
if err != nil {
return nil, err
}

if port > MaxValidPort {
return nil, fmt.Errorf("port must be < %d but found %d", MaxValidPort, port)
}
ports[port] = struct{}{}
}
case 2:
Expand Down
Loading