update

Signed-off-by: husharp <[email protected]>
HuSharp · Jun 26, 2023 · a1ad556 · a1ad556
1 parent c028915
commit a1ad556
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/schedule/operator/operator_controller.go b/pkg/schedule/operator/operator_controller.go
@@ -617,13 +617,13 @@ func (oc *Controller) buryOperator(op *Operator, extraFields ...zap.Field) {
 
 		if op.Kind()&OpMerge != 0 {
 			relatedID, _ := strconv.ParseUint(op.AdditionalInfos["merge-related-id"], 10, 64)
-			if relatedOp := oc.GetOperator(relatedID); relatedOp != nil && relatedOp.Status() != CANCELED {
+			if relatedOp := oc.operators[relatedID]; relatedOp != nil && relatedOp.Status() != CANCELED {
 				log.Info("merge operator cancel related region",
 					zap.Uint64("region-id", relatedID),
 					zap.Duration("takes", relatedOp.RunningTime()),
 					zap.String("additional-info", relatedOp.GetAdditionalInfo()))
 				relatedOp.Cancel()
-				oc.RemoveOperator(relatedOp)
+				oc.removeOperatorLocked(relatedOp)
 			}
 		}
 	}