Skip to content

Commit 77a73ab

Browse files
committed
address minor comments
Signed-off-by: Britania Rodriguez Reyes <britaniar@microsoft.com>
1 parent 9d05726 commit 77a73ab

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

pkg/controllers/updaterun/controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req runtime.Request) (runtim
176176
return runtime.Result{}, r.recordUpdateRunSucceeded(ctx, updateRun)
177177
}
178178

179-
return r.updateUpdateRunStatus(ctx, updateRun, waitTime, execErr, state, runObjRef)
179+
return r.handleIncompleteUpdateRun(ctx, updateRun, waitTime, execErr, state, runObjRef)
180180
case placementv1beta1.StateStop:
181181
// Stop the updateRun.
182182
klog.V(2).InfoS("Stopping the updateRun", "state", state, "updatingStageIndex", updatingStageIndex, "updateRun", runObjRef)
@@ -191,7 +191,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req runtime.Request) (runtim
191191
return runtime.Result{}, r.recordUpdateRunStopped(ctx, updateRun)
192192
}
193193

194-
return r.updateUpdateRunStatus(ctx, updateRun, waitTime, stopErr, state, runObjRef)
194+
return r.handleIncompleteUpdateRun(ctx, updateRun, waitTime, stopErr, state, runObjRef)
195195

196196
default:
197197
// Initialize, Run, or Stop are the only supported states.
@@ -202,7 +202,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req runtime.Request) (runtim
202202
return runtime.Result{}, nil
203203
}
204204

205-
func (r *Reconciler) updateUpdateRunStatus(ctx context.Context, updateRun placementv1beta1.UpdateRunObj, waitTime time.Duration, err error, state placementv1beta1.State, runObjRef klog.ObjectRef) (runtime.Result, error) {
205+
func (r *Reconciler) handleIncompleteUpdateRun(ctx context.Context, updateRun placementv1beta1.UpdateRunObj, waitTime time.Duration, err error, state placementv1beta1.State, runObjRef klog.ObjectRef) (runtime.Result, error) {
206206
// The execution or stopping is not finished yet or it encounters a retriable error.
207207
// We need to record the status and requeue.
208208
if updateErr := r.recordUpdateRunStatus(ctx, updateRun); updateErr != nil {

pkg/controllers/updaterun/execution.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ func (r *Reconciler) executeUpdatingStage(
224224
}
225225
}
226226
markClusterUpdatingStarted(clusterStatus, updateRun.GetGeneration())
227-
markStageUpdatingStarted(updatingStageStatus, updateRun.GetGeneration())
227+
markStageUpdatingProgressStarted(updatingStageStatus, updateRun.GetGeneration())
228228
// Need to continue as we need to process at most maxConcurrency number of clusters in parallel.
229229
continue
230230
}
@@ -328,7 +328,7 @@ func (r *Reconciler) executeDeleteStage(
328328
existingDeleteStageClusterMap[existingDeleteStageStatus.Clusters[i].ClusterName] = &existingDeleteStageStatus.Clusters[i]
329329
}
330330
// Mark the delete stage as started in case it's not.
331-
markStageUpdatingStarted(updateRunStatus.DeletionStageStatus, updateRun.GetGeneration())
331+
markStageUpdatingProgressStarted(updateRunStatus.DeletionStageStatus, updateRun.GetGeneration())
332332
for _, binding := range toBeDeletedBindings {
333333
bindingSpec := binding.GetBindingSpec()
334334
curCluster, exist := existingDeleteStageClusterMap[bindingSpec.TargetCluster]
@@ -698,8 +698,8 @@ func markUpdateRunWaiting(updateRun placementv1beta1.UpdateRunObj, message strin
698698
})
699699
}
700700

701-
// markStageUpdatingStarted marks the stage updating status as started in memory.
702-
func markStageUpdatingStarted(stageUpdatingStatus *placementv1beta1.StageUpdatingStatus, generation int64) {
701+
// markStageUpdatingProgressStarted marks the stage updating status as started in memory.
702+
func markStageUpdatingProgressStarted(stageUpdatingStatus *placementv1beta1.StageUpdatingStatus, generation int64) {
703703
if stageUpdatingStatus.StartTime == nil {
704704
stageUpdatingStatus.StartTime = &metav1.Time{Time: time.Now()}
705705
}

pkg/controllers/updaterun/stop.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func (r *Reconciler) stopUpdatingStage(
7979
for i := 0; i < len(updatingStageStatus.Clusters); i++ {
8080
clusterStatus := &updatingStageStatus.Clusters[i]
8181
clusterStartedCond := meta.FindStatusCondition(clusterStatus.Conditions, string(placementv1beta1.ClusterUpdatingConditionStarted))
82-
if clusterStartedCond == nil || condition.IsConditionStatusFalse(clusterStartedCond, updateRun.GetGeneration()) {
82+
if !condition.IsConditionStatusTrue(clusterStartedCond, updateRun.GetGeneration()) {
8383
// Cluster has not started updating therefore no need to do anything.
8484
continue
8585
}
@@ -168,7 +168,7 @@ func (r *Reconciler) stopDeleteStage(
168168
klog.ErrorS(unexpectedErr, "The binding should be deleting before we mark a cluster deleting", "clusterStatus", curCluster, "updateRun", updateRunRef)
169169
return false, fmt.Errorf("%w: %s", errStagedUpdatedAborted, unexpectedErr.Error())
170170
}
171-
return false, nil
171+
continue
172172
}
173173
}
174174

0 commit comments

Comments
 (0)