diff --git a/pkg/operator/ceph/file/filesystem.go b/pkg/operator/ceph/file/filesystem.go
index c6cba903b17e7..2430c9b08f323 100644
--- a/pkg/operator/ceph/file/filesystem.go
+++ b/pkg/operator/ceph/file/filesystem.go
@@ -18,10 +18,8 @@ package file
 
 import (
 	"fmt"
-	"syscall"
 
 	"github.com/rook/rook/pkg/operator/k8sutil"
-	"github.com/rook/rook/pkg/util/exec"
 
 	"github.com/pkg/errors"
 	cephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1"
@@ -51,37 +49,31 @@ func createFilesystem(
 	ownerInfo *k8sutil.OwnerInfo,
 	dataDirHostPath string,
 ) error {
+	logger.Infof("start running mdses for filesystem %q", fs.Name)
+	c := mds.NewCluster(clusterInfo, context, clusterSpec, fs, ownerInfo, dataDirHostPath)
+	if err := c.Start(); err != nil {
+		return err
+	}
+
 	if len(fs.Spec.DataPools) != 0 {
 		f := newFS(fs.Name, fs.Namespace)
 		if err := f.doFilesystemCreate(context, clusterInfo, clusterSpec, fs.Spec); err != nil {
 			return errors.Wrapf(err, "failed to create filesystem %q", fs.Name)
 		}
 	}
-
-	filesystem, err := cephclient.GetFilesystem(context, clusterInfo, fs.Name)
-	if err != nil {
-		return errors.Wrapf(err, "failed to get filesystem %q", fs.Name)
-	}
-
 	if fs.Spec.MetadataServer.ActiveStandby {
-		if err = cephclient.AllowStandbyReplay(context, clusterInfo, fs.Name, fs.Spec.MetadataServer.ActiveStandby); err != nil {
+		if err := cephclient.AllowStandbyReplay(context, clusterInfo, fs.Name, fs.Spec.MetadataServer.ActiveStandby); err != nil {
 			return errors.Wrapf(err, "failed to set allow_standby_replay to filesystem %q", fs.Name)
 		}
 	}
 
 	// set the number of active mds instances
 	if fs.Spec.MetadataServer.ActiveCount > 1 {
-		if err = cephclient.SetNumMDSRanks(context, clusterInfo, fs.Name, fs.Spec.MetadataServer.ActiveCount); err != nil {
+		if err := cephclient.SetNumMDSRanks(context, clusterInfo, fs.Name, fs.Spec.MetadataServer.ActiveCount); err != nil {
 			logger.Warningf("failed setting active mds count to %d. %v", fs.Spec.MetadataServer.ActiveCount, err)
 		}
 	}
 
-	logger.Infof("start running mdses for filesystem %q", fs.Name)
-	c := mds.NewCluster(clusterInfo, context, clusterSpec, fs, filesystem, ownerInfo, dataDirHostPath)
-	if err := c.Start(); err != nil {
-		return err
-	}
-
 	return nil
 }
 
@@ -94,15 +86,7 @@ func deleteFilesystem(
 	ownerInfo *k8sutil.OwnerInfo,
 	dataDirHostPath string,
 ) error {
-	filesystem, err := cephclient.GetFilesystem(context, clusterInfo, fs.Name)
-	if err != nil {
-		if code, ok := exec.ExitStatus(err); ok && code == int(syscall.ENOENT) {
-			// If we're deleting the filesystem anyway, ignore the error that the filesystem doesn't exist
-			return nil
-		}
-		return errors.Wrapf(err, "failed to get filesystem %q", fs.Name)
-	}
-	c := mds.NewCluster(clusterInfo, context, clusterSpec, fs, filesystem, ownerInfo, dataDirHostPath)
+	c := mds.NewCluster(clusterInfo, context, clusterSpec, fs, ownerInfo, dataDirHostPath)
 
 	// Delete mds CephX keys and configuration in centralized mon database
 	replicas := fs.Spec.MetadataServer.ActiveCount * 2
@@ -110,7 +94,7 @@ func deleteFilesystem(
 		daemonLetterID := k8sutil.IndexToName(i)
 		daemonName := fmt.Sprintf("%s-%s", fs.Name, daemonLetterID)
 
-		err = c.DeleteMdsCephObjects(daemonName)
+		err := c.DeleteMdsCephObjects(daemonName)
 		if err != nil {
 			return errors.Wrapf(err, "failed to delete mds ceph objects for filesystem %q", fs.Name)
 		}
diff --git a/pkg/operator/ceph/file/mds/mds.go b/pkg/operator/ceph/file/mds/mds.go
index 6baa9828d7564..0ceafde7e9c37 100644
--- a/pkg/operator/ceph/file/mds/mds.go
+++ b/pkg/operator/ceph/file/mds/mds.go
@@ -20,7 +20,6 @@ package mds
 import (
 	"context"
 	"fmt"
-	"strconv"
 	"strings"
 	"syscall"
 	"time"
@@ -58,7 +57,6 @@ type Cluster struct {
 	context         *clusterd.Context
 	clusterSpec     *cephv1.ClusterSpec
 	fs              cephv1.CephFilesystem
-	fsID            string
 	ownerInfo       *k8sutil.OwnerInfo
 	dataDirHostPath string
 }
@@ -75,7 +73,6 @@ func NewCluster(
 	context *clusterd.Context,
 	clusterSpec *cephv1.ClusterSpec,
 	fs cephv1.CephFilesystem,
-	fsdetails *cephclient.CephFilesystemDetails,
 	ownerInfo *k8sutil.OwnerInfo,
 	dataDirHostPath string,
 ) *Cluster {
@@ -84,7 +81,6 @@ func NewCluster(
 		context:         context,
 		clusterSpec:     clusterSpec,
 		fs:              fs,
-		fsID:            strconv.Itoa(fsdetails.ID),
 		ownerInfo:       ownerInfo,
 		dataDirHostPath: dataDirHostPath,
 	}
@@ -233,7 +229,7 @@ func (c *Cluster) isCephUpgrade() (bool, error) {
 			return false, err
 		}
 		if cephver.IsSuperior(c.clusterInfo.CephVersion, *currentVersion) {
-			logger.Debugf("ceph version for MDS %q is %q and target version is %q", key, currentVersion, c.clusterInfo.CephVersion)
+			logger.Debugf("ceph version for MDS %q is %q and target version is %q", key, currentVersion.String(), c.clusterInfo.CephVersion.String())
 			return true, err
 		}
 	}
@@ -250,7 +246,9 @@ func (c *Cluster) upgradeMDS() error {
 		return errors.Wrap(err, "failed to setting allow_standby_replay to false")
 	}
 
-	// In Pacific, standby-replay daemons are stopped automatically. Older versions of Ceph require us to stop these daemons manually.
+	// In Pacific, standby-replay daemons are stopped automatically. Older versions of Ceph require
+	// us to stop these daemons manually.
+	// TODO: so why don't we have a version check?
 	if err := cephclient.FailAllStandbyReplayMDS(c.context, c.clusterInfo, c.fs.Name); err != nil {
 		return errors.Wrap(err, "failed to fail mds agent in up:standby-replay state")
 	}
diff --git a/pkg/operator/ceph/file/mds/spec_test.go b/pkg/operator/ceph/file/mds/spec_test.go
index d6c9d53e4ae11..864145a92bce4 100644
--- a/pkg/operator/ceph/file/mds/spec_test.go
+++ b/pkg/operator/ceph/file/mds/spec_test.go
@@ -72,7 +72,6 @@ func testDeploymentObject(t *testing.T, network cephv1.NetworkSpec) (*apps.Deplo
 			Network:     network,
 		},
 		fs,
-		&cephclient.CephFilesystemDetails{ID: 15},
 		&k8sutil.OwnerInfo{},
 		"/var/lib/rook/",
 	)
diff --git a/tests/integration/ceph_base_file_test.go b/tests/integration/ceph_base_file_test.go
index f2acba483cb3a..e54e765967d54 100644
--- a/tests/integration/ceph_base_file_test.go
+++ b/tests/integration/ceph_base_file_test.go
@@ -387,7 +387,14 @@ func createFilesystem(helper *clients.TestClient, k8sh *utils.K8sHelper, s suite
 	require.Nil(s.T(), fscErr)
 	logger.Infof("File system %s created", filesystemName)
 
-	filesystemList, _ := helper.FSClient.List(settings.Namespace)
+	var filesystemList []cephclient.CephFilesystem
+	for range []int{0, 10} {
+		filesystemList, _ = helper.FSClient.List(settings.Namespace)
+		if len(filesystemList) == 1 {
+			break
+		}
+		time.Sleep(time.Second * 5)
+	}
 	require.Equal(s.T(), 1, len(filesystemList), "There should be one shared file system present")
 }