From b6568b07b4e40dec74b8e8b15aa49357e70438cc Mon Sep 17 00:00:00 2001 From: travisn Date: Fri, 26 Apr 2019 09:35:50 -0600 Subject: [PATCH] ceph: stop disabling scrubbing during osd orchestration Signed-off-by: travisn --- pkg/daemon/ceph/client/osd.go | 32 ---------------------------- pkg/operator/ceph/cluster/osd/osd.go | 10 --------- 2 files changed, 42 deletions(-) diff --git a/pkg/daemon/ceph/client/osd.go b/pkg/daemon/ceph/client/osd.go index 23ca096f4..e8ed78182 100644 --- a/pkg/daemon/ceph/client/osd.go +++ b/pkg/daemon/ceph/client/osd.go @@ -148,38 +148,6 @@ func OSDRemove(context *clusterd.Context, clusterName string, osdID int) (string return string(buf), err } -func DisableScrubbing(context *clusterd.Context, clusterName string) (string, error) { - args := []string{"osd", "set", "noscrub"} - buf, err := ExecuteCephCommand(context, clusterName, args) - if err != nil { - return string(buf), fmt.Errorf("failed to set noscrub: %+v", err) - } - - args = []string{"osd", "set", "nodeep-scrub"} - buf, err = ExecuteCephCommand(context, clusterName, args) - if err != nil { - return string(buf), fmt.Errorf("failed to set nodeep-scrub: %+v", err) - } - - return string(buf), nil -} - -func EnableScrubbing(context *clusterd.Context, clusterName string) (string, error) { - args := []string{"osd", "unset", "noscrub"} - buf, err := ExecuteCephCommand(context, clusterName, args) - if err != nil { - return string(buf), fmt.Errorf("failed to unset noscrub: %+v", err) - } - - args = []string{"osd", "unset", "nodeep-scrub"} - buf, err = ExecuteCephCommand(context, clusterName, args) - if err != nil { - return string(buf), fmt.Errorf("failed to unset nodeep-scrub: %+v", err) - } - - return string(buf), nil -} - func (usage *OSDUsage) ByID(osdID int) *OSDNodeUsage { for i := range usage.OSDNodes { if usage.OSDNodes[i].ID == osdID { diff --git a/pkg/operator/ceph/cluster/osd/osd.go b/pkg/operator/ceph/cluster/osd/osd.go index d3dd0a47b..460670732 100644 --- a/pkg/operator/ceph/cluster/osd/osd.go +++ b/pkg/operator/ceph/cluster/osd/osd.go @@ -142,16 +142,6 @@ func (c *Cluster) Start() error { logger.Warningf("useAllNodes is set to false and no nodes are specified, no OSD pods are going to be created") } - // disable scrubbing during orchestration and ensure it gets enabled again afterwards - if o, err := client.DisableScrubbing(c.context, c.Namespace); err != nil { - logger.Warningf("failed to disable scrubbing: %+v. %s", err, o) - } - defer func() { - if o, err := client.EnableScrubbing(c.context, c.Namespace); err != nil { - logger.Warningf("failed to enable scrubbing: %+v. %s", err, o) - } - }() - if c.DesiredStorage.UseAllNodes { // resolve all storage nodes c.DesiredStorage.Nodes = nil