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(metanode): change over quota message to warn #1000082017

Browse Source 
Signed-off-by: clinx <chenlin1@oppo.com>
This commit is contained in:
clinx 2025-04-25 15:54:24 +08:00 committed by zhumingze1108
parent 5bd3da5846
commit 261d6068d9
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
metanode/manager_op.go
View File

@ -1323,7 +1323,12 @@ func (m *metadataManager) opMetaExtentAddWithCheck(conn net.Conn, p *Packet,
}
if err = mp.ExtentAppendWithCheck(req, p); err != nil {
log.LogErrorf("%s [opMetaExtentAddWithCheck] ExtentAppendWithCheck: %s", remoteAddr, err.Error())
errMsg := err.Error()
if strings.Contains(errMsg, "over quota") {
log.LogWarnf("%s [opMetaExtentAddWithCheck] ExtentAppendWithCheck: %s", remoteAddr, errMsg)
} else {
log.LogErrorf("%s [opMetaExtentAddWithCheck] ExtentAppendWithCheck: %s", remoteAddr, errMsg)
}
}
m.updatePackRspSeq(mp, p)
if err = m.respondToClientWithVer(conn, p); err != nil {

2
metanode/partition_op_extent.go
View File

@ -98,7 +98,7 @@ func (mp *metaPartition) ExtentAppend(req *proto.AppendExtentKeyRequest, p *Pack
func (mp *metaPartition) ExtentAppendWithCheck(req *proto.AppendExtentKeyWithCheckRequest, p *Packet) (err error) {
status := mp.isOverQuota(req.Inode, true, false)
if status != 0 {
log.LogErrorf("ExtentAppendWithCheck fail status [%v]", status)
log.LogWarnf("ExtentAppendWithCheck fail status [%v]", status)
err = errors.New("ExtentAppendWithCheck is over quota")
reply := []byte(err.Error())
p.PacketErrorWithBody(status, reply)

8
metanode/server.go
View File

@ -18,6 +18,7 @@ import (
"fmt"
"io"
"net"
"strings"
"github.com/xtaci/smux"
@ -98,7 +99,12 @@ func (m *MetaNode) serveConn(conn net.Conn, stopC chan uint8) {
if p.ResultCode == proto.OpWriteOpOfProtoVerForbidden {
return
}
log.LogErrorf("serve handlePacket fail: %v", err)
errMsg := err.Error()
if strings.Contains(errMsg, "over quota") {
log.LogWarnf("serve handlePacket fail: %v", err)
} else {
log.LogErrorf("serve handlePacket fail: %v", err)
}
}
}
}