diff --git a/pkg/operator/ceph/cluster/osd/osd.go b/pkg/operator/ceph/cluster/osd/osd.go index 0563e0e73..cdd79f454 100644 --- a/pkg/operator/ceph/cluster/osd/osd.go +++ b/pkg/operator/ceph/cluster/osd/osd.go @@ -556,7 +556,7 @@ func (c *Cluster) startOSDDaemonsOnNode(nodeName string, config *provisionConfig _, createErr := c.context.Clientset.AppsV1().Deployments(c.Namespace).Create(dp) if createErr != nil { if kerrors.IsAlreadyExists(createErr) { - logger.Infof("deployment for osd %d already exists. updating if needed", osd.ID) + logger.Debugf("deployment for osd %d already exists. updating if needed", osd.ID) if err = updateDeploymentAndWait(c.context, dp, c.Namespace, opconfig.OsdType, strconv.Itoa(osd.ID), c.skipUpgradeChecks, c.continueUpgradeAfterChecksEvenIfNotHealthy); err != nil { logger.Errorf("failed to update osd deployment %d. %v", osd.ID, err) } @@ -565,8 +565,9 @@ func (c *Cluster) startOSDDaemonsOnNode(nodeName string, config *provisionConfig logger.Warningf("failed to create osd deployment for node %q, osd %+v. %v", n.Name, osd, createErr) continue } + } else { + logger.Infof("created deployment for osd %d", osd.ID) } - logger.Infof("started deployment for osd %d", osd.ID) } } diff --git a/pkg/operator/k8sutil/deployment.go b/pkg/operator/k8sutil/deployment.go index a8b23fe8d..ec335a729 100644 --- a/pkg/operator/k8sutil/deployment.go +++ b/pkg/operator/k8sutil/deployment.go @@ -74,6 +74,8 @@ func UpdateDeploymentAndWait(context *clusterd.Context, modifiedDeployment *apps // If deployments are different, let's update! if !patchResult.IsEmpty() { + logger.Infof("updating deployment %q after verifying it is safe to stop", modifiedDeployment.Name) + // Let's verify the deployment can be stopped // retry for 5 times, every minute err = util.Retry(5, 60*time.Second, func() error { @@ -89,7 +91,6 @@ func UpdateDeploymentAndWait(context *clusterd.Context, modifiedDeployment *apps return nil, fmt.Errorf("failed to set hash annotation on deployment %q. %v", modifiedDeployment.Name, err) } - logger.Infof("updating deployment %q", modifiedDeployment.Name) if _, err := context.Clientset.AppsV1().Deployments(namespace).Update(modifiedDeployment); err != nil { return nil, fmt.Errorf("failed to update deployment %q. %v", modifiedDeployment.Name, err) }