Skip to content

Commit 7cbe44e

Browse files
zhaohuiw42zhaohuiw42
authored
fix: set default rate limit to 10240 (#408)
Bug: https://pms.uniontech.com/bug-view-359643.html
1 parent 7bcec0b commit 7cbe44e

4 files changed

Lines changed: 22 additions & 16 deletions

File tree

‎src/internal/ratelimit/ratelimit.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ const UPGRADE_DELIVERY_SERVICE = "org.deepin.upgradedelivery"
1515
const UPGRADE_DELIVERY_OBJECT_PATH = "/org/deepin/upgradedelivery"
1616
const UPGRADE_DELIVERY_INTERFACE = "org.deepin.upgradedelivery"
1717

18-
const DefaultRateLimit = 10 * 1024 // 10KB/s unit: bytes per second
19-
const MinRateLimit = 10 * 1024 // 10KB/s unit: bytes per second
20-
const MaxRateLimit = 999999 * 1024 // 999999KB/s unit: bytes per second
18+
const DefaultRateLimit = 10240 * 1024 // 10240KB/s unit: bytes per second
19+
const MinRateLimit = 10 * 1024 // 10KB/s unit: bytes per second
20+
const MaxRateLimit = 999999 * 1024 // 999999KB/s unit: bytes per second
2121

2222
// SyncLimit 服务器端限速配置信息
2323
type SyncLimit struct {

‎src/internal/updateplatform/message_report.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const defaultPlatformRepoComponents = "main community commercial"
4646
var setIPFSRateLimit = ratelimit.SetIPFSRateLimit
4747

4848
const defaultDownloadSpeedLimitConfig = `{"DownloadSpeedLimitEnabled":false,"LimitSpeed":"1024","IsOnlineSpeedLimit":false}`
49-
const defaultDeliveryRateLimitConfig = `{"LimitType":0,"StartTime":"0001-01-01T00:00:00Z","EndTime":"0001-01-01T00:00:00Z","LimitRate":10240,"CurrentRate":10240}`
49+
const defaultDeliveryRateLimitConfig = `{"LimitType":0,"StartTime":"0001-01-01T00:00:00Z","EndTime":"0001-01-01T00:00:00Z","LimitRate":10485760,"CurrentRate":10485760}`
5050

5151
type ProcessEvent struct {
5252
TaskID int `json:"taskID"`

‎src/internal/updateplatform/message_report_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,12 @@ func TestResetIntranetUpdateSettingsAfterUnregisterEnablesDeliveryAndDisablesSpe
289289
if rateInfo.LimitType != ratelimit.RateLimitTypeNo {
290290
t.Fatalf("%s LimitType = %d, want %d", name, rateInfo.LimitType, ratelimit.RateLimitTypeNo)
291291
}
292+
if rateInfo.LimitRate != ratelimit.DefaultRateLimit {
293+
t.Fatalf("%s LimitRate = %d, want %d", name, rateInfo.LimitRate, ratelimit.DefaultRateLimit)
294+
}
295+
if rateInfo.CurrentRate != ratelimit.DefaultRateLimit {
296+
t.Fatalf("%s CurrentRate = %d, want %d", name, rateInfo.CurrentRate, ratelimit.DefaultRateLimit)
297+
}
292298
}
293299
assertNoIPFSLimitRate(t, "upload", gotUpload)
294300
assertNoIPFSLimitRate(t, "download", gotDownload)

‎usr/share/dsg/configs/org.deepin.dde.lastore/org.deepin.dde.lastore.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@
636636
"visibility": "private"
637637
},
638638
"delivery-remote-download-global-limit": {
639-
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10240,\"CurrentRate\":10240}",
639+
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10485760,\"CurrentRate\":10485760}",
640640
"serial": 0,
641641
"flags": [
642642
"global"
@@ -649,7 +649,7 @@
649649
"visibility": "private"
650650
},
651651
"delivery-remote-upload-global-limit": {
652-
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10240,\"CurrentRate\":10240}",
652+
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10485760,\"CurrentRate\":10485760}",
653653
"serial": 0,
654654
"flags": [
655655
"global"
@@ -662,7 +662,7 @@
662662
"visibility": "private"
663663
},
664664
"delivery-remote-download-peak-limit": {
665-
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10240,\"CurrentRate\":10240}",
665+
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10485760,\"CurrentRate\":10485760}",
666666
"serial": 0,
667667
"flags": [
668668
"global"
@@ -675,7 +675,7 @@
675675
"visibility": "private"
676676
},
677677
"delivery-remote-upload-peak-limit": {
678-
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10240,\"CurrentRate\":10240}",
678+
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10485760,\"CurrentRate\":10485760}",
679679
"serial": 0,
680680
"flags": [
681681
"global"
@@ -688,7 +688,7 @@
688688
"visibility": "private"
689689
},
690690
"delivery-remote-download-offpeak-limit": {
691-
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10240,\"CurrentRate\":10240}",
691+
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10485760,\"CurrentRate\":10485760}",
692692
"serial": 0,
693693
"flags": [
694694
"global"
@@ -701,7 +701,7 @@
701701
"visibility": "private"
702702
},
703703
"delivery-remote-upload-offpeak-limit": {
704-
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10240,\"CurrentRate\":10240}",
704+
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10485760,\"CurrentRate\":10485760}",
705705
"serial": 0,
706706
"flags": [
707707
"global"
@@ -714,7 +714,7 @@
714714
"visibility": "private"
715715
},
716716
"delivery-local-download-global-limit": {
717-
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10240,\"CurrentRate\":10240}",
717+
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10485760,\"CurrentRate\":10485760}",
718718
"serial": 0,
719719
"flags": [
720720
"global"
@@ -727,7 +727,7 @@
727727
"visibility": "private"
728728
},
729729
"delivery-local-upload-global-limit": {
730-
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10240,\"CurrentRate\":10240}",
730+
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10485760,\"CurrentRate\":10485760}",
731731
"serial": 0,
732732
"flags": [
733733
"global"
@@ -740,7 +740,7 @@
740740
"visibility": "private"
741741
},
742742
"delivery-local-download-peak-limit": {
743-
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10240,\"CurrentRate\":10240}",
743+
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10485760,\"CurrentRate\":10485760}",
744744
"serial": 0,
745745
"flags": [
746746
"global"
@@ -753,7 +753,7 @@
753753
"visibility": "private"
754754
},
755755
"delivery-local-upload-peak-limit": {
756-
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10240,\"CurrentRate\":10240}",
756+
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10485760,\"CurrentRate\":10485760}",
757757
"serial": 0,
758758
"flags": [
759759
"global"
@@ -766,7 +766,7 @@
766766
"visibility": "private"
767767
},
768768
"delivery-local-download-offpeak-limit": {
769-
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10240,\"CurrentRate\":10240}",
769+
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10485760,\"CurrentRate\":10485760}",
770770
"serial": 0,
771771
"flags": [
772772
"global"
@@ -779,7 +779,7 @@
779779
"visibility": "private"
780780
},
781781
"delivery-local-upload-offpeak-limit": {
782-
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10240,\"CurrentRate\":10240}",
782+
"value": "{\"LimitType\":0,\"StartTime\":\"0001-01-01T00:00:00Z\",\"EndTime\":\"0001-01-01T00:00:00Z\",\"LimitRate\":10485760,\"CurrentRate\":10485760}",
783783
"serial": 0,
784784
"flags": [
785785
"global"

0 commit comments

Comments
 (0)