From 261d6068d9d2bd139dfc7bc4d9d6b5e21eb8a136 Mon Sep 17 00:00:00 2001 From: clinx Date: Fri, 25 Apr 2025 15:54:24 +0800 Subject: [PATCH] fix(metanode): change over quota message to warn #1000082017 Signed-off-by: clinx --- metanode/manager_op.go | 7 ++++++- metanode/partition_op_extent.go | 2 +- metanode/server.go | 8 +++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/metanode/manager_op.go b/metanode/manager_op.go index a0bf67983..f04c9c2b6 100644 --- a/metanode/manager_op.go +++ b/metanode/manager_op.go @@ -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 { diff --git a/metanode/partition_op_extent.go b/metanode/partition_op_extent.go index 652d58e6c..4cdd02fac 100644 --- a/metanode/partition_op_extent.go +++ b/metanode/partition_op_extent.go @@ -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) diff --git a/metanode/server.go b/metanode/server.go index 658576fa7..60e723322 100644 --- a/metanode/server.go +++ b/metanode/server.go @@ -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) + } } } }