fix: versionMap store bugs and adjust the code order

	1. fix key bug in etcd where volumeVersionMap is stored
	2. reorder code and optimize initVersionMap function
	3. add some comments

Author: mayooot

internal/model/volume.go

@@ -16,10 +16,6 @@ type Bind struct {
 	Dest string `json:"dest"`
 }
 
-func (b *Bind) Equal(other *Bind) bool {
-	return b.Src == other.Src && b.Dest == other.Dest
-}
-
 func (b *Bind) Format() string {
 	return fmt.Sprintf("%s:%s", b.Src, b.Dest)
 }

internal/scheduler/gpuscheduler/scheduler.go

@@ -17,7 +17,8 @@ import (
 const (
 	// 默认的可用GPU 数量
 	defaultAvailableGpuNums = 8
-	// gpuStatusMapKey 用于存储 GPU 使用信息的 key
+
+	// gpuScheduler 存储在 etcd 中的 key
 	gpuStatusMapKey = "gpuStatusMapKey"
 )
 
@@ -36,6 +37,7 @@ func Init(cfg *config.Config) error {
 	if err != nil {
 		return err
 	}
+
 	if Scheduler.AvailableGpuNums == 0 || len(Scheduler.GpuStatusMap) == 0 {
 		// 如果没有初始化过
 		Scheduler.AvailableGpuNums = defaultAvailableGpuNums
@@ -119,13 +121,14 @@ func (s *scheduler) serialize() *string {
 }
 
 func initFormEtcd() (s *scheduler, err error) {
-	s = &scheduler{
-		GpuStatusMap: make(map[string]byte),
-	}
 	bytes, err := etcd.Get(etcd.Gpus, gpuStatusMapKey)
 	if err != nil {
 		return s, err
 	}
+
+	s = &scheduler{
+		GpuStatusMap: make(map[string]byte),
+	}
 	if len(bytes) != 0 {
 		err = json.Unmarshal(bytes, &s)
 	}

internal/scheduler/portscheduler/scheduler.go

@@ -13,43 +13,46 @@ import (
 )
 
 const (
+	// 默认端口范围 [4000, 65535]
 	defaultStartPort   = 40000
 	defaultEndPort     = 65535
-	AvailablePortCount = defaultEndPort - defaultStartPort + 1
-	usedPortSetKey     = "usedPortSetKey"
+	availablePortCount = defaultEndPort - defaultStartPort + 1
+
+	// portScheduler 存储在 etcd 中的 key
+	usedPortSetKey = "usedPortSetKey"
 )
 
 var Scheduler *scheduler
 
-type scheduler struct {
-	sync.RWMutex
+type portParams struct {
 	StartPort      int
 	EndPort        int
 	AvailableCount int
-	UsedPortSet    map[int]struct{}
 }
 
-type Alias struct {
-	StartPort      int
-	EndPort        int
-	AvailableCount int
-	UsedPortSet    []int
+type scheduler struct {
+	sync.RWMutex
+
+	portParams
+	UsedPortSet map[int]struct{}
+}
+
+type alias struct {
+	portParams
+	UsedPortSet []int
 }
 
 // MarshalJSON 重载序列化结构体为 JSON 的方法
-// 如果直接将 scheduler 序列化，UsedPortSet 字段以 map 的形式输出，value为 struct{}{}，而且是乱序的
+// 如果直接将 scheduler 序列化，UsedPortSet 字段以 map 的形式输出，value为 struct{}{}，而且是乱序
 func (s *scheduler) MarshalJSON() ([]byte, error) {
 	onlyKeys := make([]int, 0, len(s.UsedPortSet))
 	for k, _ := range s.UsedPortSet {
 		onlyKeys = append(onlyKeys, k)
 	}
 	sort.Ints(onlyKeys)
-	return json.Marshal(Alias{
-		s.StartPort,
-		s.EndPort,
-		s.AvailableCount,
-		onlyKeys,
-	})
+	return json.Marshal(alias{
+		portParams:  s.portParams,
+		UsedPortSet: onlyKeys})
 }
 
 func Init(cfg *config.Config) error {
@@ -63,7 +66,7 @@ func Init(cfg *config.Config) error {
 		// 如果没有初始化过
 		Scheduler.StartPort = defaultStartPort
 		Scheduler.EndPort = defaultEndPort
-		Scheduler.AvailableCount = AvailablePortCount
+		Scheduler.AvailableCount = availablePortCount
 		if cfg.StartPort >= 0 && cfg.EndPort >= 0 {
 			Scheduler.StartPort = cfg.StartPort
 			Scheduler.EndPort = cfg.EndPort
@@ -143,18 +146,16 @@ func initFormEtcd() (s *scheduler, err error) {
 	if err != nil {
 		return s, err
 	}
-	var alias Alias
+
+	var alias alias
 	if len(bytes) != 0 {
 		err = json.Unmarshal(bytes, &alias)
 	}
 
 	s = &scheduler{
-		StartPort:      alias.StartPort,
-		EndPort:        alias.EndPort,
-		AvailableCount: alias.AvailableCount,
-		UsedPortSet:    make(map[int]struct{}, len(alias.UsedPortSet)),
+		portParams:  alias.portParams,
+		UsedPortSet: make(map[int]struct{}, len(alias.UsedPortSet)),
 	}
-
 	for _, port := range alias.UsedPortSet {
 		s.UsedPortSet[port] = struct{}{}
 	}

internal/version/version.go

@@ -11,12 +11,13 @@ import (
 
 var (
 	// ContainerVersionMap 用于追踪容器的版本信息
-	ContainerVersionMap versionMap
+	ContainerVersionMap *versionMap
 	// VolumeVersionMap 用于跟踪 Volume 的版本信息
-	VolumeVersionMap versionMap
+	VolumeVersionMap *versionMap
 )
 
 const (
+	// 存储在 etcd 中的 key
 	containerVersionMapKey = "containerVersionMapKey"
 	volumeVersionMapKey    = "volumeVersionMapKey"
 )
@@ -25,8 +26,8 @@ type versionMap struct {
 	cmap.ConcurrentMap[string, sync2.AtomicInt64]
 }
 
-func newVersionMap() versionMap {
-	return versionMap{cmap.New[sync2.AtomicInt64]()}
+func newVersionMap() *versionMap {
+	return &versionMap{cmap.New[sync2.AtomicInt64]()}
 }
 
 func (vm *versionMap) serialize() *string {
@@ -37,12 +38,12 @@ func (vm *versionMap) serialize() *string {
 
 func Init() error {
 	var err error
-	ContainerVersionMap, err = initVersionMap()
+	ContainerVersionMap, err = initVersionMap(containerVersionMapKey)
 	if err != nil {
 		return err
 	}
 
-	VolumeVersionMap, err = initVersionMap()
+	VolumeVersionMap, err = initVersionMap(volumeVersionMapKey)
 	if err != nil {
 		return err
 	}
@@ -60,12 +61,13 @@ func Close() error {
 	return nil
 }
 
-func initVersionMap() (vm versionMap, err error) {
-	vm = newVersionMap()
-	bytes, err := etcd.Get(etcd.Versions, containerVersionMapKey)
+func initVersionMap(key string) (vm *versionMap, err error) {
+	bytes, err := etcd.Get(etcd.Versions, key)
 	if err != nil {
 		return vm, err
 	}
+
+	vm = newVersionMap()
 	if len(bytes) != 0 {
 		err = json.Unmarshal(bytes, &vm)
 	}