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

add call to return if machine exists and consider requeue-after error… #546

Merged
merged 2 commits into from
Oct 19, 2018
Merged

add call to return if machine exists and consider requeue-after error… #546

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0418bf9
add call to return if machine exists and consider requeue-after error…
enxebre Oct 16, 2018
84cffd9
return nil/err explicitly
enxebre Oct 18, 2018
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
8 changes: 6 additions & 2 deletions pkg/controller/machine/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,18 @@ func (r *ReconcileMachine) Reconcile(request reconcile.Request) (reconcile.Resul
return reconcile.Result{Requeue: true, RequeueAfter: requeueErr.RequeueAfter}, nil
}
}
return reconcile.Result{}, err
}
// Machine resource created. Machine does not yet exist.
glog.Infof("Reconciling machine object %v triggers idempotent create.", m.ObjectMeta.Name)
if err := r.create(m); err != nil {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we want to return this, we should not shadow it

if err = r.create(m)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fwiw, we may not want to shadow the update either

glog.Warningf("unable to create machine %v: %v", name, err)
return reconcile.Result{}, err
if requeueErr, ok := err.(*controllerError.RequeueAfterError); ok {
glog.Infof("Actuator returned requeue-after error: %v", requeueErr)
return reconcile.Result{Requeue: true, RequeueAfter: requeueErr.RequeueAfter}, nil
}
}
return reconcile.Result{}, nil
return reconcile.Result{}, err
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why return err here? can this ever not-be nil? seems like we return on line 158 if err != nil, and the other assignments shadow this.

Copy link
Member Author

@enxebre enxebre Oct 18, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It can be not nil:
if line 175 returns error and is not a requeueErr error then line 182 must return the error (or nil)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct me if I am wrong - but doesn't line 175 shadow the err value, so you will never get that assignment:

if err := r.create(m)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh yeh, I think you are right! thanks! I'll change it

}

func (c *ReconcileMachine) create(machine *clusterv1.Machine) error {
Expand Down