From d1c82015f9c6a2eeef8589f0baa64fc1ac029b3d Mon Sep 17 00:00:00 2001 From: Santosh Pillai Date: Wed, 30 Oct 2019 16:56:24 +0530 Subject: [PATCH] ceph: stop orchestration restart on device config map update for osd on pvc when running OSD on PVC, orchestration should not be started again if there is any change in the device config map. Added a check to skip orchestration on device CM update when StorageClassDeviceSets are available, that is, when running osd on pvc. Signed-off-by: Santosh Pillai --- pkg/operator/ceph/cluster/controller.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/operator/ceph/cluster/controller.go b/pkg/operator/ceph/cluster/controller.go index ece039b77..e5618d59d 100644 --- a/pkg/operator/ceph/cluster/controller.go +++ b/pkg/operator/ceph/cluster/controller.go @@ -719,6 +719,10 @@ func (c *ClusterController) onDeviceCMUpdate(oldObj, newObj interface{}) { logger.Infof("Cluster %s is not ready. Skipping orchestration on device change", cluster.Namespace) continue } + if len(cluster.Spec.Storage.StorageClassDeviceSets) > 0 { + logger.Info("skip orchestration on device config map update for OSDs on PVC") + continue + } logger.Infof("Running orchestration for namespace %s after device change", cluster.Namespace) err := cluster.createInstance(c.rookImage, cluster.Info.CephVersion) if err != nil {