From 7413485b8a47dfb0c189c23fdc4b448f6fc12118 Mon Sep 17 00:00:00 2001 From: Jiffin Tony Thottan Date: Thu, 20 Aug 2020 22:29:56 +0530 Subject: [PATCH] ceph: use proper log functions in object package There is incorrect usage of log functions in the object directory, changing those instances Signed-off-by: Jiffin Tony Thottan --- pkg/operator/ceph/object/bucket/provisioner.go | 2 +- pkg/operator/ceph/object/health.go | 2 +- pkg/operator/ceph/object/objectstore.go | 2 +- pkg/operator/ceph/object/rgw.go | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/operator/ceph/object/bucket/provisioner.go b/pkg/operator/ceph/object/bucket/provisioner.go index 05b260203..37fb796bc 100644 --- a/pkg/operator/ceph/object/bucket/provisioner.go +++ b/pkg/operator/ceph/object/bucket/provisioner.go @@ -311,7 +311,7 @@ func (p Provisioner) Revoke(ob *bktv1alpha1.ObjectBucket) error { // initializeCreateOrGrant sets common provisioner receiver fields and // the services and sessions needed to provision. func (p *Provisioner) initializeCreateOrGrant(options *apibkt.BucketOptions) error { - logger.Infof("initializing and setting CreateOrGrant services") + logger.Info("initializing and setting CreateOrGrant services") // set the bucket name obc := options.ObjectBucketClaim diff --git a/pkg/operator/ceph/object/health.go b/pkg/operator/ceph/object/health.go index 02207e942..5f702b3dc 100644 --- a/pkg/operator/ceph/object/health.go +++ b/pkg/operator/ceph/object/health.go @@ -168,7 +168,7 @@ func (c *bucketChecker) checkObjectStoreHealth() error { return errors.Wrapf(err, "failed to run bucket health checks for object store %q", c.namespacedName.Name) } - logger.Debug("successfully checked object store endpoint for object store %q", c.namespacedName.Name) + logger.Debugf("successfully checked object store endpoint for object store %q", c.namespacedName.Name) // Update the EndpointStatus in the CR to reflect the healthyness updateStatusBucket(c.client, c.namespacedName, cephv1.ConditionConnected, "") diff --git a/pkg/operator/ceph/object/objectstore.go b/pkg/operator/ceph/object/objectstore.go index ae6b23618..4bd89fddd 100644 --- a/pkg/operator/ceph/object/objectstore.go +++ b/pkg/operator/ceph/object/objectstore.go @@ -699,7 +699,7 @@ func GetObjectBucketProvisioner(c *clusterd.Context, namespace string) string { provName := bucketProvisionerName obcWatchOnNamespace, err := k8sutil.GetOperatorSetting(c.Clientset, opcontroller.OperatorSettingConfigMapName, "ROOK_OBC_WATCH_OPERATOR_NAMESPACE", "false") if err != nil { - logger.Warningf("failed to verify if obc should watch the operator namespace or all of them, watching all") + logger.Warning("failed to verify if obc should watch the operator namespace or all of them, watching all") } else { if strings.EqualFold(obcWatchOnNamespace, "true") { provName = fmt.Sprintf("%s.%s", namespace, bucketProvisionerName) diff --git a/pkg/operator/ceph/object/rgw.go b/pkg/operator/ceph/object/rgw.go index 12f41de99..dd0764031 100644 --- a/pkg/operator/ceph/object/rgw.go +++ b/pkg/operator/ceph/object/rgw.go @@ -91,7 +91,7 @@ func (c *clusterConfig) startRGWPods(realmName, zoneGroupName, zoneName string) } if c.store.Spec.Gateway.Instances < 1 { // Set the minimum of at least one instance - logger.Warningf("spec.gateway.instances must be set to at least 1") + logger.Warning("spec.gateway.instances must be set to at least 1") c.store.Spec.Gateway.Instances = 1 } @@ -182,7 +182,7 @@ func (c *clusterConfig) startRGWPods(realmName, zoneGroupName, zoneName string) // scale down scenario deps, err := k8sutil.GetDeployments(c.context.Clientset, c.store.Namespace, c.storeLabelSelector()) if err != nil { - logger.Warning("could not get deployments for object store %q (matching label selector %q). %v", c.store.Name, c.storeLabelSelector(), err) + logger.Warningf("could not get deployments for object store %q (matching label selector %q). %v", c.store.Name, c.storeLabelSelector(), err) } currentRgwInstances := int(len(deps.Items)) @@ -213,7 +213,7 @@ func (c *clusterConfig) startRGWPods(realmName, zoneGroupName, zoneName string) // verify scale down was successful deps, err = k8sutil.GetDeployments(c.context.Clientset, c.store.Namespace, c.storeLabelSelector()) if err != nil { - logger.Warning("could not get deployments for object store %q (matching label selector %q). %v", c.store.Name, c.storeLabelSelector(), err) + logger.Warningf("could not get deployments for object store %q (matching label selector %q). %v", c.store.Name, c.storeLabelSelector(), err) } currentRgwInstances = len(deps.Items) if currentRgwInstances == desiredRgwInstances { @@ -251,7 +251,7 @@ func (c *clusterConfig) deleteLegacyDaemons() { logger.Debugf("looking for legacy deployment in object store %q", c.store.Name) deps, err := k8sutil.GetDeployments(c.context.Clientset, c.store.Namespace, c.storeLabelSelector()) if err != nil { - logger.Warning("could not get deployments for object store %q (matching label selector %q). %v", c.store.Name, c.storeLabelSelector(), err) + logger.Warningf("could not get deployments for object store %q (matching label selector %q). %v", c.store.Name, c.storeLabelSelector(), err) } for _, d := range deps.Items { if d.Name == instanceName(c.store.Name) {