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): hybrid cloud operation for CreateInfo should check storage class for client request

Browse Source 
close:#22151482

Signed-off-by: chihe <chihe@oppo.com>
This commit is contained in:
chihe 2024-05-07 15:48:24 +08:00 committed by AmazingChi
parent ed9545c7a7
commit 84b095887a
2 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
metanode/partition_fsm.go
View File

@ -994,9 +994,8 @@ func (mp *metaPartition) HandleLeaderChange(leader uint64) {
exporter.Warning(fmt.Sprintf("[HandleLeaderChange] pid %v init root inode id: %s.", mp.config.PartitionId, err.Error()))
}
ino := NewInode(id, proto.Mode(os.ModePerm|os.ModeDir))
//TODO:hchi,tangjingyu: decide storageClass of rootInode
//ino.StorageClass = uint32(legacyReplicaStorageClass)
ino.StorageClass = proto.StorageClass_Replica_HDD
ino.StorageClass = legacyReplicaStorageClass
//ino.StorageClass = proto.StorageClass_Replica_HDD
go mp.initInode(ino)
}
//refresh forbidden migration list

66
metanode/partition_op_inode.go
View File

@ -130,7 +130,7 @@ func txReplyInfo(inode *Inode, txInfo *proto.TransactionInfo, quotaInfos map[uin
}
// for compatibility: handle req from old version client without filed StorageType
func (mp *metaPartition) checkCreateInoStorageClassFroCompatibility(reqStorageClass uint32, inodeId uint64) (err error, resultStorageClass uint32) {
func (mp *metaPartition) checkCreateInoStorageClassForCompatibility(reqStorageClass uint32, inodeId uint64) (err error, resultStorageClass uint32) {
if proto.IsValidStorageClass(reqStorageClass) {
resultStorageClass = reqStorageClass
return
@ -162,11 +162,12 @@ func (mp *metaPartition) checkCreateInoStorageClassFroCompatibility(reqStorageCl
// CreateInode returns a new inode.
func (mp *metaPartition) CreateInode(req *CreateInoReq, p *Packet, remoteAddr string) (err error) {
var (
status = proto.OpNotExistErr
reply []byte
resp interface{}
qinode *MetaQuotaInode
inoID uint64
status = proto.OpNotExistErr
reply []byte
resp interface{}
qinode *MetaQuotaInode
inoID uint64
requiredStorageClass uint32
)
start := time.Now()
if mp.IsEnableAuditLog() {
@ -174,6 +175,11 @@ func (mp *metaPartition) CreateInode(req *CreateInoReq, p *Packet, remoteAddr st
auditlog.LogInodeOp(remoteAddr, mp.GetVolName(), p.GetOpMsg(), req.GetFullPath(), err, time.Since(start).Milliseconds(), inoID, 0)
}()
}
if err, requiredStorageClass = mp.checkCreateInoStorageClassForCompatibility(req.StorageType, inoID); err != nil {
p.PacketErrorWithBody(proto.OpErr, []byte(err.Error()))
log.LogErrorf("[CreateInode] %v, req(%+v)", err.Error(), req)
return
}
inoID, err = mp.nextInodeID()
if err != nil {
p.PacketErrorWithBody(proto.OpInodeFullErr, []byte(err.Error()))
@ -184,12 +190,7 @@ func (mp *metaPartition) CreateInode(req *CreateInoReq, p *Packet, remoteAddr st
ino.Gid = req.Gid
ino.setVer(mp.verSeq)
ino.LinkTarget = req.Target
if err, ino.StorageClass = mp.checkCreateInoStorageClassFroCompatibility(req.StorageType, inoID); err != nil {
p.PacketErrorWithBody(proto.OpErr, []byte(err.Error()))
log.LogErrorf("[CreateInode] %v, req(%+v)", err.Error(), req)
return
}
ino.StorageClass = requiredStorageClass
if proto.IsStorageClassReplica(ino.StorageClass) {
ino.HybridCouldExtents.sortedEks = NewSortedExtents()
@ -231,11 +232,12 @@ func (mp *metaPartition) CreateInode(req *CreateInoReq, p *Packet, remoteAddr st
func (mp *metaPartition) QuotaCreateInode(req *proto.QuotaCreateInodeRequest, p *Packet, remoteAddr string) (err error) {
var (
status = proto.OpNotExistErr
reply []byte
resp interface{}
qinode *MetaQuotaInode
inoID uint64
status = proto.OpNotExistErr
reply []byte
resp interface{}
qinode *MetaQuotaInode
inoID uint64
requiredStorageClass uint32
)
start := time.Now()
if mp.IsEnableAuditLog() {
@ -243,6 +245,12 @@ func (mp *metaPartition) QuotaCreateInode(req *proto.QuotaCreateInodeRequest, p
auditlog.LogInodeOp(remoteAddr, mp.GetVolName(), p.GetOpMsg(), req.GetFullPath(), err, time.Since(start).Milliseconds(), inoID, 0)
}()
}
if err, requiredStorageClass = mp.checkCreateInoStorageClassForCompatibility(req.StorageType, inoID); err != nil {
p.PacketErrorWithBody(proto.OpErr, []byte(err.Error()))
log.LogErrorf("[QuotaCreateInode] %v, req(%+v)", err.Error(), req)
return
}
inoID, err = mp.nextInodeID()
if err != nil {
p.PacketErrorWithBody(proto.OpInodeFullErr, []byte(err.Error()))
@ -252,12 +260,7 @@ func (mp *metaPartition) QuotaCreateInode(req *proto.QuotaCreateInodeRequest, p
ino.Uid = req.Uid
ino.Gid = req.Gid
ino.LinkTarget = req.Target
if err, ino.StorageClass = mp.checkCreateInoStorageClassFroCompatibility(req.StorageType, inoID); err != nil {
p.PacketErrorWithBody(proto.OpErr, []byte(err.Error()))
log.LogErrorf("[QuotaCreateInode] %v, req(%+v)", err.Error(), req)
return
}
ino.StorageClass = requiredStorageClass
for _, quotaId := range req.QuotaIds {
status = mp.mqMgr.IsOverQuota(false, true, quotaId)
@ -951,10 +954,11 @@ func (mp *metaPartition) ClearInodeCache(req *proto.ClearInodeCacheRequest, p *P
// TxCreateInode returns a new inode.
func (mp *metaPartition) TxCreateInode(req *proto.TxCreateInodeRequest, p *Packet, remoteAddr string) (err error) {
var (
status = proto.OpNotExistErr
reply []byte
resp interface{}
inoID uint64
status = proto.OpNotExistErr
reply []byte
resp interface{}
inoID uint64
requiredStorageClass uint32
)
start := time.Now()
if mp.IsEnableAuditLog() {
@ -962,6 +966,12 @@ func (mp *metaPartition) TxCreateInode(req *proto.TxCreateInodeRequest, p *Packe
auditlog.LogInodeOp(remoteAddr, mp.GetVolName(), p.GetOpMsg(), req.GetFullPath(), err, time.Since(start).Milliseconds(), inoID, 0)
}()
}
if err, requiredStorageClass = mp.checkCreateInoStorageClassForCompatibility(req.StorageType, inoID); err != nil {
p.PacketErrorWithBody(proto.OpErr, []byte(err.Error()))
log.LogErrorf("[QuotaCreateInode] %v, req(%+v)", err.Error(), req)
return
}
inoID, err = mp.nextInodeID()
if err != nil {
p.PacketErrorWithBody(proto.OpInodeFullErr, []byte(err.Error()))
@ -992,7 +1002,7 @@ func (mp *metaPartition) TxCreateInode(req *proto.TxCreateInodeRequest, p *Packe
txIno.Inode.Uid = req.Uid
txIno.Inode.Gid = req.Gid
txIno.Inode.LinkTarget = req.Target
txIno.Inode.StorageClass = req.StorageType
txIno.Inode.StorageClass = requiredStorageClass
if log.EnableDebug() {
log.LogDebugf("NewTxInode: TxInode: %v", txIno)