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 assign migration hdd ek in UpdateExtentKeyAfterMigration

Browse Source 
Signed-off-by: chihe <chihe@oppo.com>
This commit is contained in:
true1064 2023-12-28 16:11:11 +08:00 committed by AmazingChi
parent 4c73097a3d
commit a2c2d4a704
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
metanode/partition_op_inode.go
View File

@ -1059,7 +1059,8 @@ func (mp *metaPartition) RenewalForbiddenMigration(req *proto.RenewalForbiddenMi
func (mp *metaPartition) UpdateExtentKeyAfterMigration(req *proto.UpdateExtentKeyAfterMigrationRequest, p *Packet,
remoteAddr string) (err error) {
ino := NewInode(req.Inode, 0)
if item := mp.inodeTree.Get(ino); item == nil {
var item BtreeItem
if item = mp.inodeTree.Get(ino); item == nil {
err = fmt.Errorf("mp %v inode %v reqeust cann't found", mp.config.PartitionId, ino.Inode)
log.LogErrorf("action[UpdateExtentKeyAfterMigration] %v", err)
p.PacketErrorWithBody(proto.OpNotExistErr, []byte(err.Error()))
@ -1094,8 +1095,13 @@ func (mp *metaPartition) UpdateExtentKeyAfterMigration(req *proto.UpdateExtentKe
if req.StorageClass == proto.StorageClass_BlobStore {
ino.HybridCouldExtentsMigration.sortedEks = NewSortedObjExtentsFromObjEks(req.NewObjExtentKeys)
} else if req.StorageClass == proto.MediaType_HDD {
//do nothing, ek has been stored in ino.HybridCouldExtentsMigration before UpdateExtentKeyAfterMigration
//is called
if item.(*Inode).HybridCouldExtentsMigration.storageClass != proto.MediaType_HDD {
err = fmt.Errorf("mp %v inode %v migration class now is %v",
mp.config.PartitionId, ino.Inode, item.(*Inode).HybridCouldExtentsMigration.storageClass)
log.LogErrorf("action[UpdateExtentKeyAfterMigration] %v", err)
p.PacketErrorWithBody(proto.OpErr, []byte(err.Error()))
}
ino.HybridCouldExtentsMigration.sortedEks = item.(*Inode).HybridCouldExtentsMigration.sortedEks
} else {
err = fmt.Errorf("mp %v inode %v unsupport new migration storage class %v",
mp.config.PartitionId, ino.Inode, req.StorageClass)

2
proto/lifecycle.go
View File

@ -41,7 +41,7 @@ func OpTypeToStorageType(op string) uint32 {
case OpTypeStorageClassEBS:
return StorageClass_BlobStore
}
return 0
return StorageClass_Unspecified
}
type LcConfiguration struct {