[fix][dingospeed] Fix that the proxy address is empty

Author: zhaoxianhua

config/config.yaml

@@ -17,13 +17,13 @@ server:
 
 scheduler:
     mode: cluster    #运行的两种模式：standalone&cluster,default:standalone
-    addr: 10.230.204.102:19091   # 调度器地址 10.230.204.102:19091
+    addr: 10.230.203.240:19091   # 调度器地址 10.230.204.102:19091
     strategy:                       #在cluster模型下，文件调度策略
         minimumFileSize: 0          # 文件参与调度最小值，单位字节
         syncProcessInterval: 100      # 同步下载进度的间隔，默认是100个块同步1次。
     discovery:                      #在cluster模型下，服务上报到scheduler的信息
         instanceId: hd-01
-        host: 10.230.204.102
+        host: 10.230.203.240
         port: 8090
         heartbeatPeriod: 5          # 心跳周期，单位秒
     publicDomain: http://hfmirror.mas.zetyun.cn:8082
@@ -68,9 +68,9 @@ diskClean:
     collectTimePeriod: 1  #定期检测磁盘使用量时间周期，单位小时（H）
 
 dynamicProxy:
-    enabled: true    #是否启用动态代理，当hfNetLoc配置的地址访问异常时，会自动切换到bpHfNetLoc。
-    httpProxy: http://127.0.0.1:7890   #http://127.0.0.1:7890，科学上网代理地址
-    httpProxyConnTest: true
+    enabled: false    #是否启用动态代理，当hfNetLoc配置的地址访问异常时，会自动切换到bpHfNetLoc。
+    httpProxy: ""   #http://127.0.0.1:7890，科学上网代理地址
+    httpProxyConnTest: false    #定时检测翻墙代理是否可用
     httpProxyName: "马鞍山服务器"
     timePeriod: 60 #定期检测代理是否可用时间周期，单位秒（S）
     maxContinuousFails: 5 #连续失败次数超过该值，则认为代理不可用

internal/service/task/mount_cache_task.go

@@ -49,8 +49,15 @@ func (m *MountCacheTask) DoTask() {
 	}
 	defer logF.Close()
 	hfEndpoint := fmt.Sprintf("http://%s:%d", config.SysConfig.Server.Host, config.SysConfig.Server.Port)
-	cmd := exec.Command("hf", "download", "--repo-type",
-		repoType, orgRepo, "--local-dir", localModelDir, "--token", getToken(m.Authorization))
+	token := getToken(m.Authorization)
+	var cmd *exec.Cmd
+	if token != "" {
+		cmd = exec.Command("hf", "download", "--repo-type",
+			repoType, orgRepo, "--local-dir", localModelDir, "--token", token)
+	} else {
+		cmd = exec.Command("hf", "download", "--repo-type",
+			repoType, orgRepo, "--local-dir", localModelDir)
+	}
 	cmd.Env = append(os.Environ(), fmt.Sprintf("HF_ENDPOINT=%s", hfEndpoint))
 	cmd.Stdout = logF
 	cmd.Stderr = logF

pkg/common/pool.go

@@ -44,6 +44,7 @@ type Pool struct {
 	persist  bool
 	size     int
 	wg       sync.WaitGroup
+	mu       sync.Mutex
 }
 
 // NewPool 创建新协程池
@@ -80,12 +81,21 @@ func (p *Pool) worker() {
 	}
 }
 
+func (p *Pool) exist(taskNo int) bool {
+	return p.taskMap.Exist(taskNo)
+}
+
 func (p *Pool) GetTask(taskNo int) (Task, bool) {
 	return p.taskMap.Get(taskNo)
 }
 
 // Submit 提交任务
 func (p *Pool) Submit(ctx context.Context, task Task) error {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	if p.persist && p.exist(task.GetTaskNo()) {
+		return nil
+	}
 	select {
 	case p.taskChan <- task:
 		if p.persist {
@@ -98,6 +108,11 @@ func (p *Pool) Submit(ctx context.Context, task Task) error {
 }
 
 func (p *Pool) SubmitForTimeout(ctx context.Context, task Task) error {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	if p.persist && p.exist(task.GetTaskNo()) {
+		return nil
+	}
 	select {
 	case p.taskChan <- task:
 		if p.persist {

pkg/common/safe_map.go

@@ -40,6 +40,13 @@ func (sm *SafeMap[K, V]) Get(key K) (V, bool) {
 	return value, exists
 }
 
+func (sm *SafeMap[K, V]) Exist(key K) bool {
+	sm.mu.RLock()
+	defer sm.mu.RUnlock()
+	_, exists := sm.m[key]
+	return exists
+}
+
 func (sm *SafeMap[K, V]) Delete(key K) {
 	sm.mu.Lock()
 	defer sm.mu.Unlock()

pkg/util/http_util.go

@@ -99,12 +99,16 @@ func NewHTTPClientWithProxy(method string) (*http.Client, error) {
 				return http.ErrUseLastResponse // 阻止跟随重定向
 			},
 			Timeout: config.SysConfig.GetReqTimeOut()}
-		proxyHeadClient.Transport = transport
+		if transport != nil {
+			proxyHeadClient.Transport = transport
+		}
 		return proxyHeadClient, nil
 	}
 	proxyOnce.Do(func() {
 		proxyClient = &http.Client{Timeout: config.SysConfig.GetReqTimeOut()}
-		proxyClient.Transport = transport
+		if transport != nil {
+			proxyClient.Transport = transport
+		}
 	})
 	return proxyClient, nil
 }