fix: Prevent local rate-limiting config from overriding remote config.

Bug: https://pms.uniontech.com/bug-view-355949.html

Author: xml

src/lastore-daemon/dbusutil.go

@@ -31,10 +31,9 @@ const (
 func (m *Manager) setEffectiveOnlineRateLimit(nowTime string) {
 	downloadSpeed := m.updater.downloadSpeedLimitConfigObj
 	m.applyOnlineRateLimit(&downloadSpeed, nowTime)
-	downloadSpeedStr, err := json.Marshal(downloadSpeed)
-	if err == nil {
-		logger.Infof("setEffectiveOnlineRateLimit %v --> %v", m.config.DownloadSpeedLimitConfig, string(downloadSpeedStr))
-		m.updater.SetDownloadSpeedLimit(string(downloadSpeedStr))
+	logger.Infof("set download limit %v --> %v by platform", m.updater.DownloadSpeedLimitConfig, downloadSpeed)
+	if err := m.updater.setDownloadSpeedLimit(downloadSpeed); err != nil {
+		logger.Warning(err)
 	}
 }
 

src/lastore-daemon/manager_download.go

@@ -470,12 +470,10 @@ func (m *Manager) refreshThrottlingFromPlatform() error {
 
 	m.applyOnlineRateLimit(&downloadSpeed, m.updatePlatform.OnlineRateLimit.ServerTime)
 
-	downloadSpeedStr, err := json.Marshal(downloadSpeed)
-	if err != nil {
-		return fmt.Errorf("failed to marshal download speed limit")
+	logger.Infof("set download limit %v --> %v by platform", m.updater.DownloadSpeedLimitConfig, downloadSpeed)
+	if err := m.updater.setDownloadSpeedLimit(downloadSpeed); err != nil {
+		logger.Warningf("Failed to set download speed limit %v", err)
 	}
-	logger.Infof("set download limit %v --> %v by platform", m.config.DownloadSpeedLimitConfig, string(downloadSpeedStr))
-	m.updater.SetDownloadSpeedLimit(string(downloadSpeedStr))
 
 	return nil
 }

src/lastore-daemon/manager_update.go

@@ -7,7 +7,6 @@ package main
 import (
 	"encoding/json"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/godbus/dbus/v5"
@@ -133,43 +132,63 @@ func (u *Updater) SetIdleDownloadConfig(idleConfig string) *dbus.Error {
 }
 
 func (u *Updater) SetDownloadSpeedLimit(limitConfig string) *dbus.Error {
-	if err := json.Unmarshal([]byte(limitConfig), &u.downloadSpeedLimitConfigObj); err != nil {
+	var limitConfigObj downloadSpeedLimitConfig
+	if err := json.Unmarshal([]byte(limitConfig), &limitConfigObj); err != nil {
 		logger.Warning(err)
 		return dbusutil.ToError(err)
 	}
-	if u.setDownloadSpeedLimitTimer == nil {
-		u.setDownloadSpeedLimitTimer = time.AfterFunc(time.Second, func() {
-			config, err := json.Marshal(u.downloadSpeedLimitConfigObj)
-			if err != nil {
-				logger.Warning(err)
-				return
-			}
-			changed := u.setPropDownloadSpeedLimitConfig(string(config))
-			if changed {
-				logger.Infof("set changed speed limit: %v", limitConfig)
-				// When IsOnlineSpeedLimit is false, it means manual speed limit is set.
-				// Save to both configs to ensure the value persists after daemon restart.
-				if strings.Contains(limitConfig, "IsOnlineSpeedLimit") && !u.downloadSpeedLimitConfigObj.IsOnlineSpeedLimit {
-					err := u.config.SetLocalDownloadSpeedLimitConfig(string(config))
-					if err != nil {
-						logger.Warning(err)
-						return
-					}
-				} else {
-					err := u.config.SetDownloadSpeedLimitConfig(string(config))
-					if err != nil {
-						logger.Warning(err)
-						return
-					}
-				}
-				u.manager.ChangePrepareDistUpgradeJobOption()
-			}
-			logger.Info("update limit config")
-		})
-	} else {
-		u.setDownloadSpeedLimitTimer.Reset(time.Second)
+	if u.downloadSpeedLimitConfigObj.IsOnlineSpeedLimit {
+		// 在线限速优先级更高，如果通过dbus设置了一个本地限速，则不应该把在线限速的配置覆盖掉
+		return nil
+	}
+	// dbus设置数据本地限速，强制将IsOnlineSpeedLimit设置为false
+	limitConfigObj.IsOnlineSpeedLimit = false
+	if err := u.setDownloadSpeedLimit(limitConfigObj); err != nil {
+		logger.Warning(err)
+		return dbusutil.ToError(err)
+	}
+	return nil
+}
+
+func (u *Updater) setDownloadSpeedLimit(limitConfigObj downloadSpeedLimitConfig) error {
+	u.PropsMu.Lock()
+	if u.setDownloadSpeedLimitTimer != nil {
+		u.setDownloadSpeedLimitTimer.Stop()
 		logger.Info("reset limit timer")
 	}
+	u.setDownloadSpeedLimitTimer = time.AfterFunc(time.Second, func() {
+		u.PropsMu.Lock()
+		logger.Infof("set download limit %v --> %v", u.downloadSpeedLimitConfigObj, limitConfigObj)
+		u.downloadSpeedLimitConfigObj = limitConfigObj
+		config, err := json.Marshal(limitConfigObj)
+		if err != nil {
+			logger.Warning(err)
+			u.PropsMu.Unlock()
+			return
+		}
+		changed := u.setPropDownloadSpeedLimitConfig(string(config))
+		if changed {
+			if !u.downloadSpeedLimitConfigObj.IsOnlineSpeedLimit {
+				err := u.config.SetLocalDownloadSpeedLimitConfig(string(config))
+				if err != nil {
+					logger.Warning(err)
+					u.PropsMu.Unlock()
+					return
+				}
+			} else {
+				err := u.config.SetDownloadSpeedLimitConfig(string(config))
+				if err != nil {
+					logger.Warning(err)
+					u.PropsMu.Unlock()
+					return
+				}
+			}
+			u.manager.ChangePrepareDistUpgradeJobOption()
+		}
+		u.PropsMu.Unlock()
+		logger.Info("update limit config")
+	})
+	u.PropsMu.Unlock()
 	return nil
 }