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

Refactor allocator to attempt to reduce complexity #2823

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Refactor allocator to attempt to reduce complexity #2823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abf521f
allocator: use consistent naming for attachment var
thaJeztah Feb 9, 2019
a1abcca
allocator: reduce cyclomatic complexity
thaJeztah Feb 9, 2019
e2dbb1d
allocator: handle "restore" earlier
thaJeztah Feb 9, 2019
b0ee1de
manager/allocator/cnmallocator: IsAttachmentAllocated: simplify
thaJeztah Nov 21, 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
6 changes: 1 addition & 5 deletions manager/allocator/cnmallocator/networkallocator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,11 +484,7 @@ func (na *cnmNetworkAllocator) DeallocateTask(t *api.Task) error {

// IsAttachmentAllocated returns if the passed node and network has resources allocated or not.
func (na *cnmNetworkAllocator) IsAttachmentAllocated(node *api.Node, networkAttachment *api.NetworkAttachment) bool {
if node == nil {
return false
}

if networkAttachment == nil || networkAttachment.Network == nil {
if node == nil || networkAttachment == nil || networkAttachment.Network == nil {
return false
}

Expand Down
59 changes: 27 additions & 32 deletions manager/allocator/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,25 +1008,22 @@ func (a *Allocator) allocateNode(ctx context.Context, node *api.Node, existingAd
}
}

if lbAttachment != nil {
if nc.nwkAllocator.IsAttachmentAllocated(node, lbAttachment) {
continue
}
if existingAddressesOnly && (lbAttachment == nil || len(lbAttachment.Addresses) == 0) {
// we're restoring state, don't allocate new (or empty) attachments
continue
}

if nc.nwkAllocator.IsAttachmentAllocated(node, lbAttachment) {
// already allocated; we're done
continue
}

if lbAttachment == nil {
// if we're restoring state, we should not add an attachment here.
if existingAddressesOnly {
continue
}
// network was not yet allocated to the node, so create a new attachment
lbAttachment = &api.NetworkAttachment{}
node.Attachments = append(node.Attachments, lbAttachment)
}

if existingAddressesOnly && len(lbAttachment.Addresses) == 0 {
continue
}

lbAttachment.Network = network.Copy()
if err := a.netCtx.nwkAllocator.AllocateAttachment(node, lbAttachment); err != nil {
log.G(ctx).WithError(err).Errorf("Failed to allocate network resources for node %s", node.ID)
Expand All @@ -1053,28 +1050,26 @@ func (a *Allocator) allocateNode(ctx context.Context, node *api.Node, existingAd
// wiki on github:
// https://github.com/golang/go/wiki/SliceTricks#filtering-without-allocating
attachments := node.Attachments[:0]
for _, attach := range node.Attachments {
if _, ok := nwIDs[attach.Network.ID]; ok {
for _, na := range node.Attachments {
if _, ok := nwIDs[na.Network.ID]; ok {
// attachment belongs to one of the networks, so keep it
attachments = append(attachments, attach)
} else {
// free the attachment and remove it from the node's attachments by
// re-slicing
if err := a.netCtx.nwkAllocator.DeallocateAttachment(node, attach); err != nil {
// if deallocation fails, there's nothing we can do besides log
// an error and keep going
log.G(ctx).WithError(err).Errorf(
"error deallocating attachment for network %v on node %v",
attach.Network.ID, node.ID,
)
}
// strictly speaking, nothing was allocated, but something was
// deallocated and that counts.
allocated = true
// also, set the somethingWasDeallocated flag so the allocator
// knows that it can now try again.
a.netCtx.somethingWasDeallocated = true
attachments = append(attachments, na)
continue
}

if err := a.netCtx.nwkAllocator.DeallocateAttachment(node, na); err != nil {
// failed to deallocate; there's nothing we can do besides log an error and keep going
log.G(ctx).WithError(err).Errorf("error deallocating attachment for network %v on node %v",
na.Network.ID, node.ID)
}

// strictly speaking, nothing was allocated, but something was
// deallocated and that counts.
allocated = true

// also, set the somethingWasDeallocated flag so the allocator
// knows that it can now try again.
a.netCtx.somethingWasDeallocated = true
}
node.Attachments = attachments

Expand Down