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

feat(clustermgr): create volume route for admin interface

Browse Source 
. #1000431984

Signed-off-by: slasher <shenjie1@oppo.com>
This commit is contained in:
slasher 2026-03-10 10:12:36 +08:00 committed by 梁曟風
parent ad09ec279d
commit 193bfb416b
3 changed files with 91 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
blobstore/cli/common/cfmt/cluster.go
View File

@ -44,6 +44,9 @@ func VolumeInfoF(vol *clustermgr.VolumeInfo) []string {
fmt.Sprintf("Total : %-16d (%s)", vol.Total, humanize.IBytes(vol.Total)),
fmt.Sprintf("Free : %-16d (%s)", vol.Free, freeC.Sprint(humanize.IBytes(vol.Free))),
fmt.Sprintf("Used : %-16d (%s)", vol.Used, usedC.Sprint(humanize.IBytes(vol.Used))),
fmt.Sprintf("CreateBy : %d", vol.CreateByNodeID),
fmt.Sprintf("Epoch : %d", vol.Epoch),
fmt.Sprintf("RouteVer : %d", vol.RouteVersion),
fmt.Sprintf("Uints: (%d) [", len(vol.Units)),
}...)
alterColor := common.NewAlternateColor(3)

33
blobstore/clustermgr/volumemgr/volumemgr.go
View File

@ -733,7 +733,16 @@ func (v *VolumeMgr) applyAdminUpdateVolumeUnit(ctx context.Context, unitInfo *cm
}
vol.lock.RUnlock()
diskInfo, err := v.diskMgr.GetDiskInfo(ctx, unitInfo.DiskID)
if err != nil {
return err
}
vol.lock.Lock()
defer vol.lock.Unlock()
oldDiskID := vol.vUnits[index].vuInfo.DiskID
if proto.IsValidEpoch(unitInfo.Epoch) {
vol.vUnits[index].epoch = unitInfo.Epoch
vol.vUnits[index].vuInfo.Vuid = proto.EncodeVuid(vol.vUnits[index].vuidPrefix, unitInfo.Epoch)
@ -741,19 +750,27 @@ func (v *VolumeMgr) applyAdminUpdateVolumeUnit(ctx context.Context, unitInfo *cm
if proto.IsValidEpoch(unitInfo.NextEpoch) {
vol.vUnits[index].nextEpoch = unitInfo.NextEpoch
}
diskInfo, err := v.diskMgr.GetDiskInfo(ctx, unitInfo.DiskID)
if err != nil {
vol.lock.Unlock()
return err
}
vol.vUnits[index].vuInfo.DiskID = diskInfo.DiskID
vol.vUnits[index].vuInfo.Host = diskInfo.Host
vol.vUnits[index].vuInfo.Compacting = unitInfo.Compacting
unitRecord := vol.vUnits[index].ToVolumeUnitRecord()
err = v.volumeTbl.PutVolumeUnit(unitInfo.Vuid.VuidPrefix(), unitRecord)
vol.lock.Unlock()
return err
if oldDiskID != diskInfo.DiskID { // if DiskID changed, generate RouteVersion
newRouteVersion := v.routeMgr.GenRouteVersion(ctx, 1)
route := &base.RouteItem{
RouteVersion: proto.RouteVersion(newRouteVersion),
Type: proto.RouteItemTypeUpdateVolume,
ItemDetail: &routeItemVolumeUpdate{VuidPrefix: unitInfo.Vuid.VuidPrefix()},
}
vol.volInfoBase.RouteVersion = proto.RouteVersion(newRouteVersion)
v.routeMgr.InsertRouteItems(ctx, []*base.RouteItem{route})
volRecord := vol.ToRecord()
routeRecord := routeItemToRouteRecord(route)
return v.volumeTbl.UpdateVolumeUnitAndPutVolumeAndRoute(unitRecord, volRecord, routeRecord)
}
return v.volumeTbl.PutVolumeUnit(unitInfo.Vuid.VuidPrefix(), unitRecord)
}
// only leader node can create volume and check expire volume

63
blobstore/clustermgr/volumemgr/volumemgr_test.go
View File

@ -834,6 +834,69 @@ func TestVolumeMgr_ApplyAdminUpdateVolumeUnit(t *testing.T) {
require.Error(t, err)
}
func TestVolumeMgr_ApplyAdminUpdateVolumeUnit_RouteVersion(t *testing.T) {
mockVolumeMgr, clean := initMockVolumeMgr(t)
defer clean()
_, ctx := trace.StartSpanFromContext(context.Background(), "adminUpdateVolumeUnitRouteVersion")
initialRouteVersion := mockVolumeMgr.routeMgr.GetRouteVersion()
vol := mockVolumeMgr.all.getVol(1)
initialVolRouteVersion := vol.volInfoBase.RouteVersion
oldDiskID := vol.vUnits[1].vuInfo.DiskID
// test case 1: update with same DiskID, RouteVersion should NOT change
unitInfoSameDisk := &clustermgr.AdminUpdateUnitArgs{
Epoch: 1,
NextEpoch: 2,
VolumeUnitInfo: clustermgr.VolumeUnitInfo{
Vuid: proto.EncodeVuid(proto.EncodeVuidPrefix(1, 1), 1),
DiskID: oldDiskID, // same disk
Compacting: true,
},
}
err := mockVolumeMgr.applyAdminUpdateVolumeUnit(ctx, unitInfoSameDisk)
require.NoError(t, err)
vol = mockVolumeMgr.all.getVol(1)
require.Equal(t, initialVolRouteVersion, vol.volInfoBase.RouteVersion)
require.Equal(t, initialRouteVersion, mockVolumeMgr.routeMgr.GetRouteVersion())
// test case 2: update with different DiskID, RouteVersion should change
newDiskID := proto.DiskID(99)
unitInfoDiffDisk := &clustermgr.AdminUpdateUnitArgs{
Epoch: 1,
NextEpoch: 3,
VolumeUnitInfo: clustermgr.VolumeUnitInfo{
Vuid: proto.EncodeVuid(proto.EncodeVuidPrefix(1, 1), 1),
DiskID: newDiskID, // different disk
Compacting: false,
},
}
err = mockVolumeMgr.applyAdminUpdateVolumeUnit(ctx, unitInfoDiffDisk)
require.NoError(t, err)
vol = mockVolumeMgr.all.getVol(1)
newRouteVersion := mockVolumeMgr.routeMgr.GetRouteVersion()
require.Greater(t, newRouteVersion, initialRouteVersion)
require.Equal(t, proto.RouteVersion(newRouteVersion), vol.volInfoBase.RouteVersion)
require.Equal(t, newDiskID, vol.vUnits[1].vuInfo.DiskID)
ret, err := mockVolumeMgr.GetVolumeRoutes(ctx, &clustermgr.GetVolumeRoutesArgs{
RouteVersion: proto.RouteVersion(initialRouteVersion),
})
require.NoError(t, err)
require.Greater(t, len(ret.Items), 0)
found := false
for _, item := range ret.Items {
if item.Type == proto.RouteItemTypeUpdateVolume {
found = true
break
}
}
require.True(t, found, "should have RouteItemTypeUpdateVolume in route items")
}
func TestVolumeMgr_LockVolume(t *testing.T) {
mockVolumeMgr, clean := initMockVolumeMgr(t)
defer clean()