Skip to content

MLE-24840: Fix the bugMarkLogic group fails to scale up after being scaled down to 0 replicas #104

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

Merged
merged 2 commits into from
Oct 24, 2025
Merged

MLE-24840: Fix the bugMarkLogic group fails to scale up after being scaled down to 0 replicas #104

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6617be6
MLE-24840: fix bug when scale node to 0 failed
Oct 22, 2025
ca55408
fix context issue
Oct 23, 2025
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
78 changes: 38 additions & 40 deletions pkg/k8sutil/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,44 @@ func (oc *OperatorContext) ReconcileStatefulset() (reconcile.Result, error) {
oc.Recorder.Event(oc.MarklogicGroup, "Normal", "StatefulSetCreated", "MarkLogic statefulSet created successfully")
return result.Done().Output()
}
_, outputErr := result.Error(err).Output()
if outputErr != nil {
logger.Error(outputErr, "Failed to process result error")
}
logger.Error(err, "Cannot get statefulSet for MarkLogic")
return result.Error(err).Output()
}

patchDiff, err := patch.DefaultPatchMaker.Calculate(currentSts, statefulSetDef,
patch.IgnoreStatusFields(),
patch.IgnoreVolumeClaimTemplateTypeMetaAndStatus(),
patch.IgnoreField("kind"))
logger.Info("Patch Diff:", "Diff", patchDiff.String())
logger.Info("statefulSetDef Spec:", "Spec", statefulSetDef.Spec.Replicas)
if err != nil {
logger.Error(err, "Cannot create standalone statefulSet for MarkLogic")
logger.Error(err, "Error calculating patch")
return result.Error(err).Output()
}

if !patchDiff.IsEmpty() {
logger.Info("MarkLogic statefulSet spec is different from the MarkLogicGroup spec, updating the statefulSet")
currentSts.Spec = statefulSetDef.Spec
currentSts.ObjectMeta.Annotations = statefulSetDef.ObjectMeta.Annotations
currentSts.ObjectMeta.Labels = statefulSetDef.ObjectMeta.Labels
err := oc.Client.Update(oc.Ctx, currentSts)
if err != nil {
logger.Error(err, "Error updating statefulSet")
return result.Error(err).Output()
}
} else {
logger.Info("MarkLogic statefulSet spec is the same as the current spec, no update needed")
}
logger.Info("Operator Status:", "Stage", cr.Status.Stage)
if cr.Status.Stage == "STS_CREATED" {
logger.Info("MarkLogic statefulSet created successfully, waiting for pods to be ready")
pods, err := GetPodsForStatefulSet(oc.Ctx, cr.Namespace, cr.Spec.Name)
if err != nil {
logger.Error(err, "Error getting pods for statefulset")
}
logger.Info("Pods in statefulSet: ", "Pods", pods)
}

patchClient := client.MergeFrom(oc.MarklogicGroup.DeepCopy())
updated := false
if currentSts.Status.ReadyReplicas == 0 || currentSts.Status.ReadyReplicas != currentSts.Status.Replicas {
Expand Down Expand Up @@ -132,37 +161,6 @@ func (oc *OperatorContext) ReconcileStatefulset() (reconcile.Result, error) {
}
}

patchDiff, err := patch.DefaultPatchMaker.Calculate(currentSts, statefulSetDef,
patch.IgnoreStatusFields(),
patch.IgnoreVolumeClaimTemplateTypeMetaAndStatus(),
patch.IgnoreField("kind"))
if err != nil {
logger.Error(err, "Error calculating patch")
return result.Error(err).Output()
}
if !patchDiff.IsEmpty() {
logger.Info("MarkLogic statefulSet spec is different from the MarkLogicGroup spec, updating the statefulSet")
currentSts.Spec = statefulSetDef.Spec
currentSts.ObjectMeta.Annotations = statefulSetDef.ObjectMeta.Annotations
currentSts.ObjectMeta.Labels = statefulSetDef.ObjectMeta.Labels
err := oc.Client.Update(oc.Ctx, currentSts)
if err != nil {
logger.Error(err, "Error updating statefulSet")
return result.Error(err).Output()
}
} else {
logger.Info("MarkLogic statefulSet spec is the same as the current spec, no update needed")
}
logger.Info("Operator Status:", "Stage", cr.Status.Stage)
if cr.Status.Stage == "STS_CREATED" {
logger.Info("MarkLogic statefulSet created successfully, waiting for pods to be ready")
pods, err := GetPodsForStatefulSet(cr.Namespace, cr.Spec.Name)
if err != nil {
logger.Error(err, "Error getting pods for statefulset")
}
logger.Info("Pods in statefulSet: ", "Pods", pods)
}

return result.Done().Output()
}

Expand All @@ -180,7 +178,7 @@ func (oc *OperatorContext) setCondition(condition *metav1.Condition) bool {
func (oc *OperatorContext) GetStatefulSet(namespace string, stateful string) (*appsv1.StatefulSet, error) {
logger := oc.ReqLogger
statefulInfo := &appsv1.StatefulSet{}
err := oc.Client.Get(context.TODO(), client.ObjectKey{Namespace: namespace, Name: stateful}, statefulInfo)
err := oc.Client.Get(oc.Ctx, client.ObjectKey{Namespace: namespace, Name: stateful}, statefulInfo)
if err != nil {
logger.Info("MarkLogic statefulSet get action failed")
return nil, err
Expand All @@ -191,7 +189,7 @@ func (oc *OperatorContext) GetStatefulSet(namespace string, stateful string) (*a

func (oc *OperatorContext) createStatefulSet(statefulset *appsv1.StatefulSet, cr *marklogicv1.MarklogicGroup) error {
logger := oc.ReqLogger
err := oc.Client.Create(context.TODO(), statefulset)
err := oc.Client.Create(oc.Ctx, statefulset)
if err != nil {
logger.Error(err, "MarkLogic stateful creation failed")
return err
Expand Down Expand Up @@ -306,11 +304,11 @@ func generateStatefulSetsDef(stsMeta metav1.ObjectMeta, params statefulSetParame
return statefulSet
}

func GetPodsForStatefulSet(namespace, name string) ([]corev1.Pod, error) {
func GetPodsForStatefulSet(ctx context.Context, namespace, name string) ([]corev1.Pod, error) {
selector := fmt.Sprintf("app.kubernetes.io/name=marklogic,app.kubernetes.io/instance=%s", name)
// List Pods with the label selector
listOptions := metav1.ListOptions{LabelSelector: selector}
pods, err := GenerateK8sClient().CoreV1().Pods(namespace).List(context.TODO(), listOptions)
pods, err := GenerateK8sClient().CoreV1().Pods(namespace).List(ctx, listOptions)
if err != nil {
return nil, err
}
Expand Down