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

Jump to bottom

Fix bug, could delete subnetset when there are still stale subnetport… #636

Merged
merged 1 commit into from
Sep 2, 2024
Merged

Fix bug, could delete subnetset when there are still stale subnetport… #636

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 15 additions & 6 deletions pkg/controllers/subnetset/subnetset_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,18 @@ func (r *SubnetSetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
} else {
if controllerutil.ContainsFinalizer(obj, servicecommon.SubnetSetFinalizerName) {
metrics.CounterInc(r.SubnetService.NSXConfig, metrics.ControllerDeleteTotal, MetricResTypeSubnetSet)
if err := r.DeleteSubnetForSubnetSet(*obj, false); err != nil {
hasStaleSubnetPorts, err := r.DeleteSubnetForSubnetSet(*obj, false)
if err != nil {
log.Error(err, "deletion failed, would retry exponentially", "subnetset", req.NamespacedName)
deleteFail(r, ctx, obj, "")
return ResultRequeue, err
}
if hasStaleSubnetPorts {
err := fmt.Errorf("stale subnet ports found while deleting subnetset %v", req.NamespacedName)
log.Error(err, "deletion failed, delete all the subnetports first", "subnetset", req.NamespacedName)
updateFail(r, ctx, obj, err.Error())
return ResultRequeue, err
}
controllerutil.RemoveFinalizer(obj, servicecommon.SubnetSetFinalizerName)
if err := r.Client.Update(ctx, obj); err != nil {
log.Error(err, "deletion failed, would retry exponentially", "subnetset", req.NamespacedName)
Expand Down Expand Up @@ -254,7 +261,7 @@ func (r *SubnetSetReconciler) CollectGarbage(ctx context.Context) {

subnetSetIDs := sets.New[string]()
for _, subnetSet := range subnetSetList.Items {
if err := r.DeleteSubnetForSubnetSet(subnetSet, true); err != nil {
if _, err := r.DeleteSubnetForSubnetSet(subnetSet, true); err != nil {
metrics.CounterInc(r.SubnetService.NSXConfig, metrics.ControllerDeleteFailTotal, MetricResTypeSubnetSet)
} else {
metrics.CounterInc(r.SubnetService.NSXConfig, metrics.ControllerDeleteSuccessTotal, MetricResTypeSubnetSet)
Expand All @@ -273,12 +280,14 @@ func (r *SubnetSetReconciler) CollectGarbage(ctx context.Context) {
}
}

func (r *SubnetSetReconciler) DeleteSubnetForSubnetSet(obj v1alpha1.SubnetSet, updataStatus bool) error {
func (r *SubnetSetReconciler) DeleteSubnetForSubnetSet(obj v1alpha1.SubnetSet, updataStatus bool) (bool, error) {
nsxSubnets := r.SubnetService.SubnetStore.GetByIndex(servicecommon.TagScopeSubnetSetCRUID, string(obj.GetUID()))
hitError := false
hasStaleSubnetPorts := false
for _, subnet := range nsxSubnets {
portNums := len(r.SubnetPortService.GetPortsOfSubnet(*subnet.Id))
if portNums > 0 {
hasStaleSubnetPorts = true
continue
}
if err := r.SubnetService.DeleteSubnet(*subnet); err != nil {
Expand All @@ -289,13 +298,13 @@ func (r *SubnetSetReconciler) DeleteSubnetForSubnetSet(obj v1alpha1.SubnetSet, u
}
if updataStatus {
if err := r.SubnetService.UpdateSubnetSetStatus(&obj); err != nil {
return err
return hasStaleSubnetPorts, err
}
}
if hitError {
return errors.New("error occurs when deleting subnet")
return hasStaleSubnetPorts, errors.New("error occurs when deleting subnet")
}
return nil
return hasStaleSubnetPorts, nil
}

func StartSubnetSetController(mgr ctrl.Manager, subnetService *subnet.SubnetService,
Expand Down
Loading