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

[vSphere] Add check for nil motask #621

Merged
merged 2 commits into from
Jun 22, 2020
Merged

[vSphere] Add check for nil motask #621

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70e7ee2
[vSphere] Add check for nil motask
Jun 22, 2020
4369a75
[vSphere] Fix typos in actuator
Jun 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
75 changes: 41 additions & 34 deletions pkg/controller/vsphere/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,21 @@ func (r *Reconciler) create() error {
return err
}
}
if moTask.Info.State == types.TaskInfoStateError {
metrics.RegisterFailedInstanceCreate(&metrics.MachineLabels{
Name: r.machine.Name,
Namespace: r.machine.Namespace,
Reason: fmt.Sprintf("Create machine task finished with error: %+v", moTask.Info.Error),
})
}
if taskIsFinished, err := taskIsFinished(moTask); err != nil || !taskIsFinished {
if !taskIsFinished {
return fmt.Errorf("task %v has not finished", moTask.Reference().Value)

if moTask != nil {
if moTask.Info.State == types.TaskInfoStateError {
metrics.RegisterFailedInstanceCreate(&metrics.MachineLabels{
Name: r.machine.Name,
Namespace: r.machine.Namespace,
Reason: fmt.Sprintf("Create machine task finished with error: %+v", moTask.Info.Error),
})
}
if taskIsFinished, err := taskIsFinished(moTask); err != nil || !taskIsFinished {
if !taskIsFinished {
return fmt.Errorf("task %v has not finished", moTask.Reference().Value)
}
return err
}
return err
}
}

Expand Down Expand Up @@ -115,24 +118,26 @@ func (r *Reconciler) update() error {
}

if r.providerStatus.TaskRef != "" {
motask, err := r.session.GetTask(r.Context, r.providerStatus.TaskRef)
moTask, err := r.session.GetTask(r.Context, r.providerStatus.TaskRef)
if err != nil {
if !isRetrieveMONotFound(r.providerStatus.TaskRef, err) {
return err
}
}
if motask.Info.State == types.TaskInfoStateError {
metrics.RegisterFailedInstanceCreate(&metrics.MachineLabels{
Name: r.machine.Name,
Namespace: r.machine.Namespace,
Reason: fmt.Sprintf("Create machine task finished with error: %+v", motask.Info.Error),
})
}
if taskIsFinished, err := taskIsFinished(motask); err != nil || !taskIsFinished {
if !taskIsFinished {
return fmt.Errorf("task %v has not finished", motask.Reference().Value)
if moTask != nil {
if moTask.Info.State == types.TaskInfoStateError {
metrics.RegisterFailedInstanceCreate(&metrics.MachineLabels{
Name: r.machine.Name,
Namespace: r.machine.Namespace,
Reason: fmt.Sprintf("Update machine task finished with error: %+v", moTask.Info.Error),
})
}
if taskIsFinished, err := taskIsFinished(moTask); err != nil || !taskIsFinished {
if !taskIsFinished {
return fmt.Errorf("task %v has not finished", moTask.Reference().Value)
}
return err
}
return err
}
}

Expand Down Expand Up @@ -182,18 +187,20 @@ func (r *Reconciler) delete() error {
return err
}
}
if moTask.Info.State == types.TaskInfoStateError {
metrics.RegisterFailedInstanceCreate(&metrics.MachineLabels{
Name: r.machine.Name,
Namespace: r.machine.Namespace,
Reason: fmt.Sprintf("Create machine task finished with error: %+v", moTask.Info.Error),
})
}
if taskIsFinished, err := taskIsFinished(moTask); err != nil || !taskIsFinished {
if !taskIsFinished {
return fmt.Errorf("task %v has not finished", moTask.Reference().Value)
if moTask != nil {
if moTask.Info.State == types.TaskInfoStateError {
metrics.RegisterFailedInstanceCreate(&metrics.MachineLabels{
Name: r.machine.Name,
Namespace: r.machine.Namespace,
Reason: fmt.Sprintf("Delete machine task finished with error: %+v", moTask.Info.Error),
})
}
if taskIsFinished, err := taskIsFinished(moTask); err != nil || !taskIsFinished {
if !taskIsFinished {
return fmt.Errorf("task %v has not finished", moTask.Reference().Value)
}
return err
}
return err
}
}

Expand Down