diff --git a/cli/cmd/fmt.go b/cli/cmd/fmt.go index f79b07290..d78bef06f 100644 --- a/cli/cmd/fmt.go +++ b/cli/cmd/fmt.go @@ -1136,6 +1136,7 @@ func formatQuotaInfo(info *proto.QuotaInfo) string { } var badDiskDetailTableRowPattern = "%-18v %-18v %-18v %-18v %-18v" + func formatBadDiskTableHeader() string { return fmt.Sprintf(badDiskDetailTableRowPattern, "Address", "Path", "TotalPartitionCnt", "DiskErrPartitionCnt", "PartitionIdsWithDiskErr") } diff --git a/client/fuse.go b/client/fuse.go index 80a2421f0..fb4361e2a 100644 --- a/client/fuse.go +++ b/client/fuse.go @@ -85,9 +85,9 @@ const ( const ( // LoggerDir = "client" - LoggerPrefix = "client" - LoggerOutput = "output.log" - ModuleName = "fuseclient" + LoggerPrefix = "client" + LoggerOutput = "output.log" + ModuleName = "fuseclient" ConfigKeyExporterPort = "exporterKey" ControlCommandSetRate = "/rate/set" diff --git a/datanode/repl/packet.go b/datanode/repl/packet.go index ea496f0b8..58f1511cd 100644 --- a/datanode/repl/packet.go +++ b/datanode/repl/packet.go @@ -211,7 +211,7 @@ func (p *Packet) resolveFollowersAddr() (err error) { p.followersAddrs = followerAddrs[:int(followerNum)] log.LogInfof("action[resolveFollowersAddr] %v", p.followersAddrs) } - + return } diff --git a/docker/run_docker.sh b/docker/run_docker.sh index e4ab76fed..8d174c642 100755 --- a/docker/run_docker.sh +++ b/docker/run_docker.sh @@ -31,7 +31,7 @@ EOF } #compose="docker-compose --env-file ${RootPath}/docker/run_docker.env -f ${RootPath}/docker/docker-compose-hy.yml" -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" has_go() { if command -v go &> /dev/null diff --git a/objectnode/auth.go b/objectnode/auth.go index 42b8cd919..2eb2a343d 100644 --- a/objectnode/auth.go +++ b/objectnode/auth.go @@ -209,22 +209,21 @@ func (o *ObjectNode) validateAuthInfo(r *http.Request, auth Auther) (err error) if !param.action.IsNone() && o.signatureIgnoredActions.Contains(param.action) { return nil } - cred := auth.Credential() - if auth.IsSkewed() { - log.LogErrorf("validateAuthInfo: request skewed: requestID(%v) reqTime(%v) servTime(%v)", - GetRequestID(r), cred.TimeStamp, time.Now().UTC().Format(ISO8601Format)) - return RequestTimeTooSkewed - } - if auth.IsExpired() { - log.LogErrorf("validateAuthInfo: signature has expired: requestID(%v) servTime(%v) reqDate(%v) expires(%v)", - GetRequestID(r), time.Now().UTC().Format(ISO8601Format), cred.Date, cred.Expires) - return ExpiredToken - } - if !auth.SignatureMatch(sk, o.wildcards) { - log.LogErrorf("validateAuthInfo: signature not match: requestID(%v) AccessKeyId(%v)\nstringToSign=(\n%v\n)\ncanonialRequest=(\n%v\n)", - GetRequestID(r), reqAK, auth.StringToSign(), auth.CanonicalRequest()) - return SignatureDoesNotMatch - } + cred := auth.Credential() + if auth.IsSkewed() { + log.LogErrorf("validateAuthInfo: request skewed: requestID(%v) reqTime(%v) servTime(%v)", + GetRequestID(r), cred.TimeStamp, time.Now().UTC().Format(ISO8601Format)) + return RequestTimeTooSkewed + } + if auth.IsExpired() { + log.LogErrorf("validateAuthInfo: signature has expired: requestID(%v) servTime(%v) reqDate(%v) expires(%v)", + GetRequestID(r), time.Now().UTC().Format(ISO8601Format), cred.Date, cred.Expires) + return ExpiredToken + } + if !auth.SignatureMatch(sk, o.wildcards) { + log.LogErrorf("validateAuthInfo: signature not match: requestID(%v) AccessKeyId(%v)\nstringToSign=(\n%v\n)\ncanonialRequest=(\n%v\n)", + GetRequestID(r), reqAK, auth.StringToSign(), auth.CanonicalRequest()) + return SignatureDoesNotMatch } if stsInfo != nil { diff --git a/proto/model.go b/proto/model.go index 49601a5bd..2316f81b3 100644 --- a/proto/model.go +++ b/proto/model.go @@ -599,4 +599,4 @@ type BadDiskInfo struct { type BadDiskInfos struct { BadDisks []BadDiskInfo -} \ No newline at end of file +} diff --git a/sdk/master/api_admin.go b/sdk/master/api_admin.go index ac5a36932..02c668c98 100644 --- a/sdk/master/api_admin.go +++ b/sdk/master/api_admin.go @@ -725,7 +725,6 @@ func (api *AdminAPI) QueryDisks(addr string) (disks *proto.DiskInfos, err error) return } - func (api *AdminAPI) DiskDetail(addr string, diskPath string) (disk *proto.DiskInfo, err error) { disk = &proto.DiskInfo{} err = api.mc.requestWith(disk, newRequest(get, proto.QueryDiskDetail).Header(api.h).