Merge pull request rook#3742 from travisn/debug-logging

Clean up verbose Ceph logging
SUSE · Aug 30, 2019 · 5c59a1e · 5c59a1e
2 parents 09c4858 + a9deac7
commit 5c59a1e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/operator/ceph/cluster/controller.go b/pkg/operator/ceph/cluster/controller.go
@@ -486,11 +486,11 @@ func (c *ClusterController) onK8sNodeUpdate(oldObj, newObj interface{}) {
 
 	// Checking for NoSchedule added to storage node
 	if oldNodeSchedulable == false && newNodeSchedulable == false {
-		logger.Debugf("Skipping cluster update. Updated node %s was and is still unschedulable", newNode.Labels[v1.LabelHostname])
+		// Skipping cluster update. Updated node was and is still unschedulable
 		return
 	}
 	if oldNodeSchedulable == true && newNodeSchedulable == true {
-		logger.Debugf("Skipping cluster update. Updated node %s was and it is still schedulable", oldNode.Labels[v1.LabelHostname])
+		// Skipping cluster update. Updated node was and is still schedulable
 		return
 	}
 
@@ -711,7 +711,7 @@ func (c *ClusterController) onDeviceCMUpdate(oldObj, newObj interface{}) {
 
 	for _, cluster := range c.clusterMap {
 		if cluster.Info == nil {
-			logger.Info("Cluster %s is not ready. Skipping orchestration on device change", cluster.Namespace)
+			logger.Infof("Cluster %s is not ready. Skipping orchestration on device change", cluster.Namespace)
 			continue
 		}
 		logger.Infof("Running orchestration for namespace %s after device change", cluster.Namespace)

diff --git a/pkg/operator/ceph/disruption/clusterdisruption/reconcile.go b/pkg/operator/ceph/disruption/clusterdisruption/reconcile.go
@@ -92,7 +92,7 @@ func (r *ReconcileClusterDisruption) reconcile(request reconcile.Request) (recon
 		logger.Debugf("discovered NamespacedName: %s", request.NamespacedName)
 	}
 	r.namelessRetries = 0
-	logger.Infof("reconciling %s", request.NamespacedName)
+	logger.Debugf("reconciling %s", request.NamespacedName)
 
 	// get the ceph cluster
 	cephCluster := &cephv1.CephCluster{}