refactor: translate Chinese into English,and adjust the clean idle vnpus code

Signed-off-by: libin18 <libin18@kingsoft.com>

Author: dartagnanli

cmd/main.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"os"
 	"syscall"
-	"time"
 
 	"github.com/Project-HAMi/HAMi/pkg/util/client"
 	"github.com/Project-HAMi/ascend-device-plugin/internal"
@@ -74,33 +73,16 @@ restart:
 		}
 	}
 	restarting = true
+	if err := ps.CleanupIdleVNPUs(); err != nil {
+		klog.Errorf("Failed to cleanup idle vNPUs: %v", err)
+	}
 	klog.Info("Starting Plugins.")
 	err = ps.Start()
 	if err != nil {
 		klog.Errorf("Failed to start plugin server: %v", err)
 		return err
 	}
 
-	if err := ps.CleanupIdleVNPUs(); err != nil {
-		klog.Errorf("Failed to cleanup idle vNPUs: %v", err)
-	}
-	cleanupTicker := time.NewTicker(time.Duration(*checkIdleVNPUInterval) * time.Second)
-	defer cleanupTicker.Stop()
-	go func() {
-		for {
-			select {
-			case <-cleanupTicker.C:
-				klog.Info("Running scheduled idle vNPU cleanup")
-				if err := ps.CleanupIdleVNPUs(); err != nil {
-					klog.Errorf("Failed to cleanup idle vNPUs: %v", err)
-				}
-			case <-ps.StopCh():
-				klog.Info("Stopping cleanup goroutine")
-				return
-			}
-		}
-	}()
-
 	for {
 		select {
 		//case <-restartTimeout:
@@ -154,7 +136,7 @@ func main() {
 	if err != nil {
 		klog.Fatalf("load config failed, error is %v", err)
 	}
-	server, err := server.NewPluginServer(mgr, *nodeName)
+	server, err := server.NewPluginServer(mgr, *nodeName, *checkIdleVNPUInterval)
 	if err != nil {
 		klog.Fatalf("init PluginServer failed, error is %v", err)
 	}

internal/manager/manager.go

@@ -199,7 +199,7 @@ func (am *AscendManager) CleanupIdleVNPUs() error {
 			klog.Warningf("failed to get card/device ID for logic ID %d: %v", logicID, err)
 			continue
 		}
-		// 获取该设备上的所有 vNPU 信息
+		// Obtain all vNPU information on this device
 		vDevInfos, err := am.mgr.GetVirtualDeviceInfo(logicID)
 		if err != nil {
 			klog.Infof("no vNPU found on device %d or query failed: %v", logicID, err)

internal/server/server.go

@@ -52,28 +52,30 @@ var (
 )
 
 type PluginServer struct {
-	nodeName      string
-	registerAnno  string
-	handshakeAnno string
-	allocAnno     string
-	grpcServer    *grpc.Server
-	mgr           *manager.AscendManager
-	socket        string
-	stopCh        chan interface{}
-	healthCh      chan int32
+	nodeName              string
+	registerAnno          string
+	handshakeAnno         string
+	allocAnno             string
+	grpcServer            *grpc.Server
+	mgr                   *manager.AscendManager
+	socket                string
+	stopCh                chan interface{}
+	healthCh              chan int32
+	checkIdleVNPUInterval int
 }
 
-func NewPluginServer(mgr *manager.AscendManager, nodeName string) (*PluginServer, error) {
+func NewPluginServer(mgr *manager.AscendManager, nodeName string, checkIdleVNPUInterval int) (*PluginServer, error) {
 	return &PluginServer{
-		nodeName:      nodeName,
-		registerAnno:  fmt.Sprintf("hami.io/node-register-%s", mgr.CommonWord()),
-		handshakeAnno: fmt.Sprintf("hami.io/node-handshake-%s", mgr.CommonWord()),
-		allocAnno:     fmt.Sprintf("huawei.com/%s", mgr.CommonWord()),
-		grpcServer:    grpc.NewServer(),
-		mgr:           mgr,
-		socket:        path.Join(v1beta1.DevicePluginPath, fmt.Sprintf("%s.sock", mgr.CommonWord())),
-		stopCh:        make(chan interface{}),
-		healthCh:      make(chan int32),
+		nodeName:              nodeName,
+		registerAnno:          fmt.Sprintf("hami.io/node-register-%s", mgr.CommonWord()),
+		handshakeAnno:         fmt.Sprintf("hami.io/node-handshake-%s", mgr.CommonWord()),
+		allocAnno:             fmt.Sprintf("huawei.com/%s", mgr.CommonWord()),
+		grpcServer:            grpc.NewServer(),
+		mgr:                   mgr,
+		socket:                path.Join(v1beta1.DevicePluginPath, fmt.Sprintf("%s.sock", mgr.CommonWord())),
+		stopCh:                make(chan interface{}),
+		healthCh:              make(chan int32),
+		checkIdleVNPUInterval: checkIdleVNPUInterval,
 	}, nil
 }
 
@@ -91,10 +93,28 @@ func (ps *PluginServer) Start() error {
 	if err != nil {
 		return err
 	}
+	go ps.startPeriodicCheckIdleVNPUs()
 	go ps.watchAndRegister()
 	return nil
 }
 
+func (ps *PluginServer) startPeriodicCheckIdleVNPUs() {
+	ticker := time.NewTicker(time.Duration(ps.checkIdleVNPUInterval) * time.Second)
+	defer ticker.Stop()
+	for {
+		select {
+		case <-ticker.C:
+			klog.Info("Running scheduled idle vNPU cleanup")
+			if err := ps.CleanupIdleVNPUs(); err != nil {
+				klog.Errorf("Failed to cleanup idle vNPUs: %v", err)
+			}
+		case <-ps.stopCh:
+			klog.Info("Stopping cleanup goroutine")
+			return
+		}
+	}
+}
+
 func (ps *PluginServer) Stop() error {
 	close(ps.stopCh)
 	ps.grpcServer.Stop()