mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-13 18:43:34 +00:00
cephfs: upgrading mount syntax
The old syntax is almost deprecated,and there are reasons to upgrade it - old syntax is lack of fsid(critical for debugging and observability) - mds_namespace is deprecated, it might be inappropriate to continue using it - kernel will try new syntax first and then the old one, it's a waste Signed-off-by: mageekchiu <qiukang@mail.ustc.edu.cn>
This commit is contained in:
@ -103,6 +103,19 @@ func (vo *VolumeOptions) Destroy() {
|
||||
}
|
||||
}
|
||||
|
||||
func (vo *VolumeOptions) GetFSID() (string, error) {
|
||||
if vo.conn == nil {
|
||||
return "", errors.New("cluster not connected yet")
|
||||
}
|
||||
|
||||
fsID, err := vo.conn.GetFSID()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return fsID, nil
|
||||
}
|
||||
|
||||
func validateNonEmptyField(field, fieldName string) error {
|
||||
if field == "" {
|
||||
return fmt.Errorf("parameter '%s' cannot be empty", fieldName)
|
||||
@ -682,6 +695,17 @@ func NewVolumeOptionsFromMonitorList(
|
||||
opts.BackingSnapshot = true
|
||||
}
|
||||
|
||||
cr, err := util.NewAdminCredentials(secrets)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
defer cr.DeleteCredentials()
|
||||
|
||||
err = opts.Connect(cr)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
return &opts, &vid, nil
|
||||
}
|
||||
|
||||
@ -730,7 +754,7 @@ func NewVolumeOptionsFromStaticVolume(
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
if err = extractOptionalOption(&opts.FsName, "fsName", options); err != nil {
|
||||
if err = extractOption(&opts.FsName, "fsName", options); err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
@ -761,6 +785,17 @@ func NewVolumeOptionsFromStaticVolume(
|
||||
opts.BackingSnapshot = true
|
||||
}
|
||||
|
||||
cr, err := util.NewAdminCredentials(secrets)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
defer cr.DeleteCredentials()
|
||||
|
||||
err = opts.Connect(cr)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
return &opts, &vid, nil
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user