From bfcce7d4843badef1e64fde213d3074b23c693ee Mon Sep 17 00:00:00 2001 From: FengJiankui Date: Wed, 22 Dec 2021 08:47:27 +0800 Subject: [PATCH] mds: pool changed to cephpool The path resolved the problem that the variable pool is the same as the package name. (bug #9275) Signed-off-by: FengJiankui --- pkg/operator/ceph/file/filesystem.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/operator/ceph/file/filesystem.go b/pkg/operator/ceph/file/filesystem.go index e5fb794f1..b7e9385cc 100644 --- a/pkg/operator/ceph/file/filesystem.go +++ b/pkg/operator/ceph/file/filesystem.go @@ -26,7 +26,7 @@ import ( "github.com/rook/rook/pkg/clusterd" cephclient "github.com/rook/rook/pkg/daemon/ceph/client" "github.com/rook/rook/pkg/operator/ceph/file/mds" - "github.com/rook/rook/pkg/operator/ceph/pool" + cephpool "github.com/rook/rook/pkg/operator/ceph/pool" ) const ( @@ -132,12 +132,12 @@ func validateFilesystem(context *clusterd.Context, clusterInfo *cephclient.Clust if len(f.Spec.DataPools) == 0 { return nil } - if err := pool.ValidatePoolSpec(context, clusterInfo, clusterSpec, &f.Spec.MetadataPool); err != nil { + if err := cephpool.ValidatePoolSpec(context, clusterInfo, clusterSpec, &f.Spec.MetadataPool); err != nil { return errors.Wrap(err, "invalid metadata pool") } for _, p := range f.Spec.DataPools { localpoolSpec := p.PoolSpec - if err := pool.ValidatePoolSpec(context, clusterInfo, clusterSpec, &localpoolSpec); err != nil { + if err := cephpool.ValidatePoolSpec(context, clusterInfo, clusterSpec, &localpoolSpec); err != nil { return errors.Wrap(err, "Invalid data pool") } }