Skip to content

Commit 45a065e

Browse files
authored
chore: report reconfigure failed message (#9795)
1 parent 567c7f1 commit 45a065e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

pkg/operations/ops_manager.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ func (opsMgr *OpsManager) Reconcile(reqCtx intctrlutil.RequestCtx, cli client.Cl
168168
if opsRequest.Spec.Type == opsv1alpha1.CustomType {
169169
err = initOpsDefAndValidate(reqCtx, cli, opsRes)
170170
if intctrlutil.IsTargetError(err, intctrlutil.ErrorTypeFatal) {
171-
return requeueAfter, patchValidateErrorCondition(reqCtx.Ctx, cli, opsRes, err.Error())
171+
return requeueAfter, opsMgr.handleOpsCompleted(reqCtx, cli, opsRes, opsv1alpha1.OpsFailedPhase,
172+
opsv1alpha1.NewCancelFailedCondition(opsRequest, err), opsv1alpha1.NewValidateFailedCondition(opsv1alpha1.ReasonValidateFailed, err.Error()))
172173
}
173174
if err != nil {
174175
return requeueAfter, err
@@ -177,7 +178,8 @@ func (opsMgr *OpsManager) Reconcile(reqCtx intctrlutil.RequestCtx, cli client.Cl
177178
if opsRequestPhase, requeueAfter, err = opsBehaviour.OpsHandler.ReconcileAction(reqCtx, cli, opsRes); err != nil &&
178179
!isOpsRequestFailedPhase(opsRequestPhase) {
179180
if intctrlutil.IsTargetError(err, intctrlutil.ErrorTypeFatal) {
180-
return requeueAfter, patchFatalFailErrorCondition(reqCtx.Ctx, cli, opsRes, err)
181+
return requeueAfter, opsMgr.handleOpsCompleted(reqCtx, cli, opsRes, opsv1alpha1.OpsFailedPhase,
182+
opsv1alpha1.NewCancelFailedCondition(opsRequest, err), opsv1alpha1.NewFailedCondition(opsRequest, err))
181183
}
182184
// if the opsRequest phase is not failed, skipped
183185
return requeueAfter, err

pkg/operations/reconfigure.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func (r *reconfigureAction) ReconcileAction(reqCtx intctrlutil.RequestCtx, cli c
7878
return syncReconfigureForOps(reqCtx, cli, resource, opsDeepCopy, opsv1alpha1.OpsSucceedPhase)
7979
}
8080

81-
return syncReconfigureForOps(reqCtx, cli, resource, opsDeepCopy, opsv1alpha1.OpsFailedPhase)
81+
return opsv1alpha1.OpsFailedPhase, 0, intctrlutil.NewFatalError(fmt.Sprintf("reconfigure parameter failed: %s", parameters.Status.Message))
8282
}
8383

8484
func syncReconfigureForOps(reqCtx intctrlutil.RequestCtx, cli client.Client, resource *OpsResource, opsDeepCopy *opsv1alpha1.OpsRequest, phase opsv1alpha1.OpsPhase) (opsv1alpha1.OpsPhase, time.Duration, error) {

0 commit comments

Comments
 (0)