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

revert(master): revert inner code.

Browse Source 
Signed-off-by: Victor1319 <zengxuewei@oppo.com>
This commit is contained in:
Victor1319 2025-01-20 19:15:40 +08:00 committed by AmazingChi
parent 2080ed3146
commit d12bd56de6
6 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/fuse.go
View File

@ -448,9 +448,6 @@ func main() {
syslog.Printf("enable bcache %v", opt.EnableBcache)
if cfg.GetString(exporter.ConfigKeyPushAddr) == "" {
cfg.SetString(exporter.ConfigKeyPushAddr, "cfs-push.oppo.local")
}
exporter.Init(ModuleName, cfg)
exporter.RegistConsul(super.ClusterName(), ModuleName, cfg)

2
docker/run_docker.sh
View File

@ -24,7 +24,7 @@ EOF
exit 0
}
compose="docker-compose --env-file ${RootPath}/docker/run_docker.env -f ${RootPath}/docker/docker-compose.yml"
compose="docker compose --env-file ${RootPath}/docker/run_docker.env -f ${RootPath}/docker/docker-compose.yml"
clean() {

8
master/api_args_parse.go
View File

@ -507,7 +507,7 @@ func parseVolUpdateReq(r *http.Request, vol *Vol, req *updateVolReq) (err error)
return
}
if req.trashInterval, err = extractInt64WithDefault(r, trashIntervalKey, vol.TrashInterval); err != nil {
if req.trashInterval, err = extractInt64WithDefault(r, TrashIntervalKey, vol.TrashInterval); err != nil {
return
}
if req.accessTimeValidInterval, err = extractInt64WithDefault(r, accessTimeIntervalKey, vol.AccessTimeValidInterval); err != nil {
@ -827,7 +827,7 @@ func parseRequestToCreateVol(r *http.Request, req *createVolReq) (err error) {
return
}
if req.trashInterval, err = extractInt64WithDefault(r, trashIntervalKey, 0); err != nil {
if req.trashInterval, err = extractInt64WithDefault(r, TrashIntervalKey, 0); err != nil {
return
}
if req.accessTimeValidInterval, err = extractInt64WithDefault(r, accessTimeIntervalKey, proto.DefaultAccessTimeValidInterval); err != nil {
@ -846,7 +846,7 @@ func parseRequestToCreateDataPartition(r *http.Request) (count int, name string,
if countStr := r.FormValue(countKey); countStr == "" {
err = keyNotFound(countKey)
return
} else if count, err = strconv.Atoi(countStr); err != nil || count == 0 || count > 32 {
} else if count, err = strconv.Atoi(countStr); err != nil || count == 0 {
err = unmatchedKey(countKey)
return
}
@ -1781,7 +1781,7 @@ func parseRequestToSetTrashInterval(r *http.Request) (name, authKey string, inte
if authKey, err = extractAuthKey(r); err != nil {
return
}
if interval, err = extractInt64WithDefault(r, trashIntervalKey, 0); err != nil {
if interval, err = extractInt64WithDefault(r, TrashIntervalKey, 0); err != nil {
return
}
return

2
master/const.go
View File

@ -188,7 +188,7 @@ const (
defaultClientTriggerHitCnt = 1
defaultClientReqPeriodSeconds = 1
defaultMaxQuotaNumPerVol = 100
defaultVolDelayDeleteTimeHour = 168
defaultVolDelayDeleteTimeHour = 48
)
const (

4
master/server.go
View File

@ -73,7 +73,7 @@ var (
ownerRegexp = regexp.MustCompile("^[A-Za-z][A-Za-z0-9_]{0,20}$")
useConnPool = true //for test
enableDirectDeleteVol = false
enableDirectDeleteVol = true
gConfig *clusterConfig
)
@ -378,7 +378,7 @@ func (m *Server) checkConfig(cfg *config.Config) (err error) {
}
m.config.volDeletionDentryThreshold = uint64(threshold)
enableDirectDeleteVol = cfg.GetBoolWithDefault(cfgEnableDirectDeleteVol, false)
enableDirectDeleteVol = cfg.GetBoolWithDefault(cfgEnableDirectDeleteVol, true)
return
}

2
util/exporter/exporter.go
View File

@ -220,8 +220,6 @@ func autoPush(pushAddr, role, cluster, ip, mountPoint string) {
Grouping("pid", strconv.Itoa(pid)).
Grouping("commit", proto.CommitID).
Grouping("app", AppName).
Grouping("dataset", "custom").
Grouping("category", "custom").
Grouping("mountPoint", mountPoint).
Grouping("hostName", hostname)