fixes

Author: gkech

pkg/controller/perconaservermongodb/metrics_client.go

@@ -7,14 +7,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/percona/percona-server-mongodb-operator/pkg/naming"
+	"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/config"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/util/retry"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
-
-	"github.com/percona/percona-server-mongodb-operator/pkg/naming"
-	"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/config"
 )
 
 // PVCUsage contains information about PVC disk usage
@@ -30,17 +28,10 @@ func (r *ReconcilePerconaServerMongoDB) getPVCUsageFromMetrics(
 	pod *corev1.Pod,
 	pvcName string,
 ) (*PVCUsage, error) {
-	log := logf.FromContext(ctx).WithName("StorageAutoscaling").WithValues("pvc", pvcName)
-
 	if pod == nil {
 		return nil, errors.New("pod is nil")
 	}
 
-	if !isContainerAndPodRunning(*pod, naming.ComponentMongod) {
-		log.V(1).Info("skipping PVC metrics check: container and pod not running", "phase", pod.Status.Phase)
-		return nil, nil
-	}
-
 	backoff := wait.Backoff{
 		Steps:    5,
 		Duration: 5 * time.Second,

pkg/controller/perconaservermongodb/statefulset.go

@@ -54,15 +54,14 @@ func (r *ReconcilePerconaServerMongoDB) reconcileStatefulSet(ctx context.Context
 		return sfs, nil
 	}
 
-	if err := r.reconcilePVCs(ctx, cr, sfs, ls, volumeSpec); err != nil {
-		return nil, errors.Wrapf(err, "reconcile PVCs for %s", sfs.Name)
-	}
-
-	// (non-blocking)
 	if err := r.reconcileStorageAutoscaling(ctx, cr, sfs, volumeSpec, ls); err != nil {
 		log.Error(err, "failed to reconcile storage autoscaling", "statefulset", sfs.Name)
 	}
 
+	if err := r.reconcilePVCs(ctx, cr, sfs, ls, volumeSpec); err != nil {
+		return nil, errors.Wrapf(err, "reconcile PVCs for %s", sfs.Name)
+	}
+
 	if _, ok := sfs.Annotations[api.AnnotationPVCResizeInProgress]; ok {
 		log.V(1).Info("PVC resize in progress, skipping reconciliation of statefulset", "name", sfs.Name)
 		return sfs, nil

pkg/controller/perconaservermongodb/volume_autoscaling.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/percona/percona-server-mongodb-operator/pkg/naming"
 	"github.com/pkg/errors"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -102,6 +103,11 @@ func (r *ReconcilePerconaServerMongoDB) checkAndResizePVC(
 ) error {
 	log := logf.FromContext(ctx).WithName("StorageAutoscaling").WithValues("pvc", pvc.Name)
 
+	if !isContainerAndPodRunning(*pod, naming.ComponentMongod) {
+		log.V(1).Info("skipping PVC metrics check: container and pod not running", "phase", pod.Status.Phase)
+		return nil
+	}
+
 	usage, err := r.getPVCUsageFromMetrics(ctx, pod, pvc.Name)
 	if err != nil {
 		return errors.Wrap(err, "get PVC usage from metrics")
@@ -193,12 +199,11 @@ func (r *ReconcilePerconaServerMongoDB) triggerResize(
 ) error {
 	log := logf.FromContext(ctx).WithName("StorageAutoscaling").WithValues("pvc", pvc.Name)
 
-	patch := client.MergeFrom(cr.DeepCopy())
+	orig := cr.DeepCopy()
 
-	// We are modifying cr directly through the pointer. So the original cr object does get the storage size updated.
 	volumeSpec.PersistentVolumeClaim.Resources.Requests[corev1.ResourceStorage] = newSize
 
-	if err := r.client.Patch(ctx, cr.DeepCopy(), patch); err != nil {
+	if err := r.client.Patch(ctx, cr.DeepCopy(), client.MergeFrom(orig)); err != nil {
 		return errors.Wrap(err, "patch CR with new storage size")
 	}