gian/cubefs
1
0
Fork 0
mirror of https://github.com/cubefs/cubefs.git synced 2026-08-02 02:00:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(fuse): if vol name not match regexp when mount, return failed immediately.

Browse Source 
Signed-off-by: baihailong <baihailong@oppo.com>
This commit is contained in:
baihailong 2024-07-11 14:44:09 +08:00 committed by AmazingChi
parent 6cc809434a
commit e07aeac619
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/fuse.go
View File

@ -374,8 +374,8 @@ func main() {
// load conf from master
for retry := 0; retry < MasterRetrys; retry++ {
err = loadConfFromMaster(opt)
// if vol not exists, not retry
if err != nil && err.Error() != proto.ErrVolNotExists.Error() {
// if vol not exists or vol name not match regexp, not retry
if err != nil && err.Error() != proto.ErrVolNotExists.Error() && err.Error() != proto.ErrVolNameRegExpNotMatch.Error() {
time.Sleep(5 * time.Second * time.Duration(retry+1))
} else {
break

4
master/api_args_parse.go
View File

@ -280,7 +280,7 @@ func parseGetVolParameter(r *http.Request) (p *getVolParameter, err error) {
return
}
if !volNameRegexp.MatchString(p.name) {
err = errors.New("name can only be number and letters")
err = proto.ErrVolNameRegExpNotMatch
return
}
if p.authKey = r.FormValue(volAuthKey); !p.skipOwnerValidation && len(p.authKey) == 0 {
@ -1499,7 +1499,7 @@ func extractName(r *http.Request) (name string, err error) {
return
}
if !volNameRegexp.MatchString(name) {
return "", errors.New("name can only be number and letters")
return "", proto.ErrVolNameRegExpNotMatch
}
return

1
proto/errors.go
View File

@ -106,6 +106,7 @@ var (
ErrPerformingDecommission = errors.New("one replica is performing decommission")
ErrWaitForAutoAddReplica = errors.New("wait for auto add replica")
ErrBufferSizeExceedMaximum = errors.New("buffer size exceeds maximum")
ErrVolNameRegExpNotMatch = errors.New("name can only be number and letters")
)
// http response error code and error message definitions