From 0e7b1a295b3242a1b55c01a49ba087264c0ffc9b Mon Sep 17 00:00:00 2001 From: Lucas Henry Date: Fri, 4 Aug 2023 15:45:54 +0200 Subject: [PATCH] operator: fix formatting of some logger methods Some logging instructions use formatting syntax `%q`, but the logging method is `Info` or `Debug` instead of `Debugf` and `Infof`. As a result, the arguments of the method were concatenated instead of formatted properly. Signed-off-by: Lucas Henry (cherry picked from commit c948183c0e3d9a4729a607649546e799fd52c494) --- pkg/operator/ceph/nfs/config.go | 2 +- pkg/operator/ceph/object/realm/controller.go | 10 +++++----- pkg/operator/ceph/pool/radosnamespace/controller.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/operator/ceph/nfs/config.go b/pkg/operator/ceph/nfs/config.go index 95582c9a6..57512810a 100644 --- a/pkg/operator/ceph/nfs/config.go +++ b/pkg/operator/ceph/nfs/config.go @@ -265,7 +265,7 @@ func atomicPrependToConfigObject( if err != nil { logger.Infof("failed to unlock rados object %q, but since the lock has a timeout, we will continue. %v", objInfoString, err) } - logger.Info("successfully unlocked rados object %q", objInfoString) + logger.Infof("successfully unlocked rados object %q", objInfoString) }() cmd := cephclient.NewRadosCommand(context, clusterInfo, diff --git a/pkg/operator/ceph/object/realm/controller.go b/pkg/operator/ceph/object/realm/controller.go index feaeaec69..a8c41be5c 100644 --- a/pkg/operator/ceph/object/realm/controller.go +++ b/pkg/operator/ceph/object/realm/controller.go @@ -131,7 +131,7 @@ func (r *ReconcileObjectRealm) reconcile(request reconcile.Request) (reconcile.R err := r.client.Get(r.opManagerContext, request.NamespacedName, cephObjectRealm) if err != nil { if kerrors.IsNotFound(err) { - logger.Debug("CephObjectRealm %q resource not found. Ignoring since object must be deleted", request.NamespacedName.String()) + logger.Debugf("CephObjectRealm %q resource not found. Ignoring since object must be deleted", request.NamespacedName.String()) return reconcile.Result{}, *cephObjectRealm, nil } // Error reading the object - requeue the request. @@ -185,7 +185,7 @@ func (r *ReconcileObjectRealm) reconcile(request reconcile.Request) (reconcile.R // Create/Pull Ceph Realm if cephObjectRealm.Spec.IsPullRealm() { - logger.Debug("pull section in realm %q spec found", request.NamespacedName) + logger.Debugf("pull section in realm %q spec found", request.NamespacedName) _, err = r.pullCephRealm(cephObjectRealm) if err != nil { return reconcile.Result{}, *cephObjectRealm, err @@ -207,14 +207,14 @@ func (r *ReconcileObjectRealm) reconcile(request reconcile.Request) (reconcile.R r.updateStatus(observedGeneration, request.NamespacedName, k8sutil.ReadyStatus) // Return and do not requeue - logger.Debug("realm %q done reconciling", request.NamespacedName) + logger.Debugf("realm %q done reconciling", request.NamespacedName) return reconcile.Result{}, *cephObjectRealm, nil } func (r *ReconcileObjectRealm) pullCephRealm(realm *cephv1.CephObjectRealm) (reconcile.Result, error) { realmArg := fmt.Sprintf("--rgw-realm=%s", realm.Name) urlArg := fmt.Sprintf("--url=%s", realm.Spec.Pull.Endpoint) - logger.Debug("getting keys to pull realm for CephObjectRealm %q", realm.Name) + logger.Debugf("getting keys to pull realm for CephObjectRealm %q", realm.Name) accessKeyArg, secretKeyArg, err := object.GetRealmKeyArgs(r.opManagerContext, r.context, realm.Name, realm.Namespace) if err != nil { if kerrors.IsNotFound(err) { @@ -336,7 +336,7 @@ func (r *ReconcileObjectRealm) updateStatus(observedGeneration int64, name types objectRealm := &cephv1.CephObjectRealm{} if err := r.client.Get(r.opManagerContext, name, objectRealm); err != nil { if kerrors.IsNotFound(err) { - logger.Debug("CephObjectRealm %q resource not found. Ignoring since object must be deleted", name) + logger.Debugf("CephObjectRealm %q resource not found. Ignoring since object must be deleted", name) return } logger.Warningf("failed to retrieve object realm %q to update status to %q. %v", name, status, err) diff --git a/pkg/operator/ceph/pool/radosnamespace/controller.go b/pkg/operator/ceph/pool/radosnamespace/controller.go index 1ce89ef31..045d9cc44 100644 --- a/pkg/operator/ceph/pool/radosnamespace/controller.go +++ b/pkg/operator/ceph/pool/radosnamespace/controller.go @@ -249,7 +249,7 @@ func (r *ReconcileCephBlockPoolRadosNamespace) reconcile(request reconcile.Reque r.updateStatus(r.client, namespacedName, cephv1.ConditionReady) // Return and do not requeue - logger.Debug("done reconciling cephBlockPoolRadosNamespace %q", namespacedName) + logger.Debugf("done reconciling cephBlockPoolRadosNamespace %q", namespacedName) return reconcile.Result{}, nil }