Skip to content

Commit 4a2e5d1

Browse files
zhaoxianhuagithubgxll
zhaoxianhua
authored and
githubgxll
committed
[fix][dingospeed] Switching agents and configuration conflicts
1 parent 2fa92f9 commit 4a2e5d1

4 files changed

Lines changed: 26 additions & 19 deletions

File tree

‎config/config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ diskClean:
7070
dynamicProxy:
7171
enabled: true #是否启用动态代理，当hfNetLoc配置的地址访问异常时，会自动切换到bpHfNetLoc。
7272
httpProxy: http://127.0.0.1:7890 #http://127.0.0.1:7890，科学上网代理地址
73+
httpProxyConnTest: true
7374
httpProxyName: "马鞍山服务器"
7475
timePeriod: 60 #定期检测代理是否可用时间周期，单位秒（S）
7576
maxContinuousFails: 5 #连续失败次数超过该值，则认为代理不可用

‎config/grafana/Dingospeed-1747106589126.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
{
8989
"disableTextWrap": false,
9090
"editorMode": "code",
91-
"expr": "sum by (job) (sum(request_total_cnt{source=~\"^($source)$\"}))",
91+
"expr": "sum by (app) (sum(request_total_cnt{source=~\"^($source)$\"}))",
9292
"fullMetaSearch": false,
9393
"includeNullMetadata": true,
9494
"legendFormat": "__auto",
@@ -154,7 +154,7 @@
154154
{
155155
"disableTextWrap": false,
156156
"editorMode": "code",
157-
"expr": "sum by(job)(request_success_cnt{source=~\"^($source)$\"})",
157+
"expr": "sum by(app)(request_success_cnt{source=~\"^($source)$\"})",
158158
"fullMetaSearch": false,
159159
"includeNullMetadata": true,
160160
"legendFormat": "__auto",
@@ -220,7 +220,7 @@
220220
{
221221
"disableTextWrap": false,
222222
"editorMode": "code",
223-
"expr": "sum by (job) (request_fail_cnt{source=~\"^($source)$\"})",
223+
"expr": "sum by (app) (request_fail_cnt{source=~\"^($source)$\"})",
224224
"fullMetaSearch": false,
225225
"includeNullMetadata": true,
226226
"legendFormat": "__auto",
@@ -286,7 +286,7 @@
286286
{
287287
"disableTextWrap": false,
288288
"editorMode": "code",
289-
"expr": "sum by (job) (sum(request_too_many_cnt{source=~\"^($source)$\"}) or vector(0))",
289+
"expr": "sum by (app) (sum(request_too_many_cnt{source=~\"^($source)$\"}) or vector(0))",
290290
"fullMetaSearch": false,
291291
"includeNullMetadata": true,
292292
"legendFormat": "__auto",
@@ -352,7 +352,7 @@
352352
{
353353
"disableTextWrap": false,
354354
"editorMode": "code",
355-
"expr": "sum by (job) (count(request_model_cnt{source=~\"^($source)$\"}))",
355+
"expr": "sum by (app) (count(request_model_cnt{source=~\"^($source)$\"}))",
356356
"fullMetaSearch": false,
357357
"includeNullMetadata": true,
358358
"legendFormat": "__auto",
@@ -418,7 +418,7 @@
418418
{
419419
"disableTextWrap": false,
420420
"editorMode": "code",
421-
"expr": "sum by (job) (count(request_dataset_cnt{source=~\"^($source)$\"}))",
421+
"expr": "sum by (app) (count(request_dataset_cnt{source=~\"^($source)$\"}))",
422422
"fullMetaSearch": false,
423423
"includeNullMetadata": true,
424424
"legendFormat": "__auto",
@@ -484,7 +484,7 @@
484484
{
485485
"disableTextWrap": false,
486486
"editorMode": "code",
487-
"expr": "sum by (job) (request_remote_byte{source=~\"^($source)$\"} / 1048576)",
487+
"expr": "sum by (app) (request_remote_byte{source=~\"^($source)$\"} / 1048576)",
488488
"fullMetaSearch": false,
489489
"includeNullMetadata": true,
490490
"legendFormat": "__auto",
@@ -550,7 +550,7 @@
550550
{
551551
"disableTextWrap": false,
552552
"editorMode": "code",
553-
"expr": "sum by (job) (request_response_byte{source=~\"^($source)$\"} / 1048576)",
553+
"expr": "sum by (app) (request_response_byte{source=~\"^($source)$\"} / 1048576)",
554554
"fullMetaSearch": false,
555555
"includeNullMetadata": true,
556556
"legendFormat": "__auto",
@@ -663,7 +663,7 @@
663663
},
664664
"disableTextWrap": false,
665665
"editorMode": "code",
666-
"expr": "sum by (job) (request_total_cnt{source=~\"^($source)$\"})",
666+
"expr": "sum by (app) (request_total_cnt{source=~\"^($source)$\"})",
667667
"fullMetaSearch": false,
668668
"hide": false,
669669
"includeNullMetadata": true,
@@ -681,7 +681,7 @@
681681
"disableTextWrap": false,
682682
"editorMode": "code",
683683
"exemplar": false,
684-
"expr": "sum by (job) (request_success_cnt{source=~\"^($source)$\"})",
684+
"expr": "sum by (app) (request_success_cnt{source=~\"^($source)$\"})",
685685
"format": "time_series",
686686
"fullMetaSearch": false,
687687
"hide": false,
@@ -886,7 +886,7 @@
886886
},
887887
"disableTextWrap": false,
888888
"editorMode": "code",
889-
"expr": "sum by (job) (request_too_many_cnt{source=~\"^($source)$\"})",
889+
"expr": "sum by (app) (request_too_many_cnt{source=~\"^($source)$\"})",
890890
"fullMetaSearch": false,
891891
"hide": false,
892892
"includeNullMetadata": true,
@@ -903,7 +903,7 @@
903903
},
904904
"disableTextWrap": false,
905905
"editorMode": "code",
906-
"expr": "sum by (job) (request_fail_cnt{source=~\"^($source)$\"})",
906+
"expr": "sum by (app) (request_fail_cnt{source=~\"^($source)$\"})",
907907
"fullMetaSearch": false,
908908
"hide": false,
909909
"includeNullMetadata": true,
@@ -1415,15 +1415,15 @@
14151415
"$__all"
14161416
]
14171417
},
1418-
"definition": "label_values(request_total_cnt,job)",
1418+
"definition": "label_values(request_total_cnt,app)",
14191419
"includeAll": true,
14201420
"label": "所属环境",
14211421
"multi": true,
1422-
"name": "job",
1422+
"name": "app",
14231423
"options": [],
14241424
"query": {
14251425
"qryType": 1,
1426-
"query": "label_values(request_total_cnt,job)",
1426+
"query": "label_values(request_total_cnt,app)",
14271427
"refId": "PrometheusVariableQueryEditor-VariableQuery"
14281428
},
14291429
"refresh": 1,

‎internal/service/sys_service.go‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func NewSysService(schedulerDao *dao.SchedulerDao) *SysService {
4040
if config.SysConfig.DiskClean.Enabled {
4141
go sysSvc.cycleCheckDiskUsage()
4242
}
43-
if config.SysConfig.DynamicProxy.Enabled {
43+
if config.SysConfig.DynamicProxy.HttpProxyConnTest {
4444
go sysSvc.cycleTestProxyConnectivity()
4545
}
4646
})
@@ -203,6 +203,9 @@ func (s *SysService) cycleTestProxyConnectivity() {
203203
for {
204204
select {
205205
case <-ticker.C:
206+
if config.SysConfig.GetHttpProxy() == "" {
207+
return
208+
}
206209
testProxyConnectivity()
207210
}
208211
}
@@ -215,6 +218,7 @@ var (
215218
dialTimeout = 3 * time.Second
216219
continuousFailCount int
217220
hasSentFailureMsg bool
221+
mu sync.Mutex
218222
)
219223

220224
func testProxyConnectivity() {
@@ -276,6 +280,8 @@ func handleProxyTestResponse(client *http.Client, req *http.Request, proxyURL *u
276280
}
277281

278282
func handleProxyTestSuccess() {
283+
mu.Lock()
284+
defer mu.Unlock()
279285
continuousFailCount = 0
280286
hasSentFailureMsg = false
281287
if !util.ProxyIsAvailable {
@@ -285,6 +291,8 @@ func handleProxyTestSuccess() {
285291
}
286292

287293
func handleContinuousFailure(statusCode int) {
294+
mu.Lock()
295+
defer mu.Unlock()
288296
continuousFailCount++
289297
if continuousFailCount >= config.SysConfig.GetMaxContinuousFails() && !hasSentFailureMsg {
290298
util.ProxyIsAvailable = false

‎pkg/config/config.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ type DiskClean struct {
147147
type DynamicProxy struct {
148148
Enabled bool `json:"enabled" yaml:"enabled"`
149149
HttpProxy string `json:"httpProxy" yaml:"httpProxy"`
150+
HttpProxyConnTest bool `json:"httpProxyConnTest" yaml:"httpProxyConnTest"`
150151
HttpProxyName string `json:"httpProxyName" yaml:"httpProxyName"`
151152
TimePeriod int `json:"timePeriod" yaml:"timePeriod"`
152153
MaxContinuousFails int `json:"maxContinuousFails" yaml:"maxContinuousFails"`
@@ -370,9 +371,6 @@ func Scan(path string) (*Config, error) {
370371
if c.Download.RemoteFileRangeSize%c.Download.BlockSize != 0 {
371372
return nil, myerr.New("RemoteFileRangeSize must be a multiple of BlockSize")
372373
}
373-
if c.DynamicProxy.Enabled && c.DynamicProxy.HttpProxy == "" {
374-
return nil, myerr.New("HttpProxy must be specified when enable is true")
375-
}
376374
validate := validator.New()
377375
err = validate.Struct(&c)
378376
if err != nil {

0 commit comments

Comments
 (0)