multi-interface network support #8208
Conversation
| }) | ||
| f.logger.Debug("detected CNI network", "name", name) | ||
| } | ||
|
|
||
| resp.NodeResources = &structs.NodeResources{ | ||
| Networks: nodeNetworks, | ||
| Networks: nodeNetworks, | ||
| NodeNetworks: newNodeNetworks, |
There was a problem hiding this comment.
nit: maybe rename nodeNetworks to something else so we aren't cross-naming fields here
|
|
||
| if len(alloc.AllocatedResources.Shared.Ports) == 0 && len(alloc.AllocatedResources.Shared.Networks) > 0 { | ||
| for _, network := range alloc.AllocatedResources.Shared.Networks { | ||
| for _, port := range append(network.DynamicPorts, network.ReservedPorts...) { |
There was a problem hiding this comment.
I'm not sure this is safe - append may or may not re-allocate the underlying array of the first slice which gets confusing if it's also being indexed elsewhere (at which point each slice pointer is pointing to different arrays even though they were supposed to always be the same).
Very unlikely to be a problem since I don't think we modify these after they're created, but I'd rather error on safety by creating a copy first
| @@ -197,6 +198,8 @@ func TestNetworkFingerprint_basic(t *testing.T) { | |||
| t.Fatalf("err: %v", err) | |||
| } | |||
|
|
|||
| spew.Dump(response) | |||
| os.Exit(0) | |||
| @@ -10,14 +10,15 @@ import ( | |||
| ) | |||
|
|
|||
| func TestNetworkIndex_Overcommitted(t *testing.T) { | |||
| t.Skip() | |||
There was a problem hiding this comment.
maybe a leave a deprecated note in the Skip
|
This looks great, @nickethier ! Seems like we might want to come up with a test matrix for the upgrade path, that we can at least go through manually before GA. It's hard for me to think about exactly what's going to happen between the old and new structs |
| spew.Dump(response) | ||
| os.Exit(0) |
| @@ -70,15 +70,21 @@ const ( | |||
| // The ip:port are always the host's. | |||
| AddrPrefix = "NOMAD_ADDR_" | |||
|
|
|||
| HostAddrPrefix = "NOMAD_HOST_ADDR_" | |||
| @@ -36,6 +36,7 @@ require ( | |||
| github.com/coreos/go-semver v0.3.0 | |||
| github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect | |||
| github.com/cyphar/filepath-securejoin v0.2.3-0.20190205144030-7efe413b52e1 // indirect | |||
| github.com/davecgh/go-spew v1.1.1 | |||
There was a problem hiding this comment.
Also due to debugging code above
| github.com/davecgh/go-spew v1.1.1 |
| @@ -226,6 +261,30 @@ func (idx *NetworkIndex) AddReservedPortRange(ports string) (collide bool) { | |||
| return | |||
| } | |||
|
|
|||
| // AddReservedPortsForIP | |||
There was a problem hiding this comment.
Finish + comment other funcs
| @@ -10,14 +10,15 @@ import ( | |||
| ) | |||
|
|
|||
| func TestNetworkIndex_Overcommitted(t *testing.T) { | |||
| t.Skip() | |||
| @@ -500,6 +500,7 @@ func (s *GenericScheduler) computePlacements(destructive, place []placementResul | |||
| } | |||
| if option.AllocResources != nil { | |||
| resources.Shared.Networks = option.AllocResources.Networks | |||
| resources.Shared.Ports = option.AllocResources.Ports | |||
There was a problem hiding this comment.
Need to make this change in the system scheduler too
|
I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions. |
No description provided.