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 <fengjiankui@inspur.com>
This commit is contained in:
FengJiankui committed 2022-04-29 11:15:09 +08:00
1 parent 3005a6fc68
commit bfcce7d484
1 file changed
+3 -3
+3 -3
View File
@@ -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")
}
}