Skip to content

Commit 89e649d

Browse files
chuntaojunchuntaojun
authored
fix:registry metrics count total service data error (#1128)
1 parent 3c9f7c5 commit 89e649d

File tree

7 files changed

+71
-46
lines changed

7 files changed

+71
-46
lines changed

‎admin/job/job.go

+3
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@ func getMasterAccountToken(storage store.Store) (string, error) {
141141
if err != nil {
142142
return "", err
143143
}
144+
if user == nil {
145+
return "", fmt.Errorf("polaris main user: %s not found", mainUser)
146+
}
144147
return user.Token, nil
145148
}
146149

‎cache/instance_metrics.go

+10-9
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,16 @@ func (ic *instanceCache) reportMetricsInfo() {
4545
metricValues := make([]metrics.DiscoveryMetric, 0, 32)
4646

4747
_ = cacheMgr.Service().IteratorServices(func(key string, svc *model.Service) (bool, error) {
48+
if _, ok := tmpServiceInfos[svc.Namespace]; !ok {
49+
tmpServiceInfos[svc.Namespace] = map[string]struct{}{}
50+
}
51+
tmpServiceInfos[svc.Namespace][svc.Name] = struct{}{}
52+
53+
if _, ok := allServices[svc.Namespace]; !ok {
54+
allServices[svc.Namespace] = map[string]struct{}{}
55+
}
56+
allServices[svc.Namespace][svc.Name] = struct{}{}
57+
4858
if _, ok := offlineService[svc.Namespace]; !ok {
4959
offlineService[svc.Namespace] = map[string]struct{}{}
5060
}
@@ -66,15 +76,6 @@ func (ic *instanceCache) reportMetricsInfo() {
6676
return true
6777
}
6878

69-
if _, ok := tmpServiceInfos[svc.Namespace]; !ok {
70-
tmpServiceInfos[svc.Namespace] = map[string]struct{}{}
71-
}
72-
tmpServiceInfos[svc.Namespace][svc.Name] = struct{}{}
73-
74-
if _, ok := allServices[svc.Namespace]; !ok {
75-
allServices[svc.Namespace] = map[string]struct{}{}
76-
}
77-
allServices[svc.Namespace][svc.Name] = struct{}{}
7879
if _, ok := onlineService[svc.Namespace]; !ok {
7980
onlineService[svc.Namespace] = map[string]struct{}{}
8081
}

‎plugin/statis/base/base_worker.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func (s *BaseWorker) Run(ctx context.Context, interval time.Duration) {
102102
dest = dest - (dest % 60)
103103
diff := dest - nowSeconds
104104

105-
log.Infof("[APICall] prometheus stats need sleep %ds", diff)
105+
log.Infof("[APICall] base stats need sleep %ds", diff)
106106
time.Sleep(time.Duration(diff) * time.Second)
107107

108108
ticker := time.NewTicker(interval)

‎release/conf/polaris-server.yaml

+5-8
Original file line numberDiff line numberDiff line change
@@ -457,14 +457,11 @@ plugin:
457457
option:
458458
interval: 60 # Statistical interval, the unit is second
459459
statis:
460-
name: local
461-
option:
462-
interval: 60
463-
# entries:
464-
# - name: local
465-
# option:
466-
# interval: 60
467-
# - name: prometheus
460+
entries:
461+
- name: local
462+
option:
463+
interval: 60
464+
- name: prometheus
468465
ratelimit:
469466
name: token-bucket
470467
option:

‎service/routing_config_v1_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func TestCreateRoutingConfig(t *testing.T) {
141141
t.Logf("%s", resp.GetInfo().GetValue())
142142
})
143143

144-
t.Run("服务不存在，创建路由配置，报错", func(t *testing.T) {
144+
t.Run("服务不存在，创建路由配置不报错", func(t *testing.T) {
145145
discoverSuit := &DiscoverTestSuit{}
146146
if err := discoverSuit.Initialize(); err != nil {
147147
t.Fatal(err)
@@ -151,6 +151,7 @@ func TestCreateRoutingConfig(t *testing.T) {
151151
_, serviceResp := discoverSuit.createCommonService(t, 120)
152152
discoverSuit.cleanServiceName(serviceResp.GetName().GetValue(), serviceResp.GetNamespace().GetValue())
153153

154+
_ = discoverSuit.DiscoverServer().Cache().TestRefresh()
154155
req := &apitraffic.Routing{}
155156
req.Service = serviceResp.Name
156157
req.Namespace = serviceResp.Namespace

‎service/server_authability.go

+48-25
Original file line numberDiff line numberDiff line change
@@ -254,15 +254,19 @@ func (svr *serverAuthAbility) queryServiceResource(
254254
svcSet := model.NewServiceSet()
255255

256256
for index := range req {
257-
names.Add(req[index].Namespace.GetValue())
258-
svc := svr.Cache().Service().GetServiceByName(req[index].Name.GetValue(), req[index].Namespace.GetValue())
257+
svcName := req[index].GetName().GetValue()
258+
svcNamespace := req[index].GetNamespace().GetValue()
259+
names.Add(svcNamespace)
260+
svc := svr.Cache().Service().GetServiceByName(svcName, svcNamespace)
259261
if svc != nil {
260262
svcSet.Add(svc)
261263
}
262264
}
263265

264266
ret := svr.convertToDiscoverResourceEntryMaps(names, svcSet)
265-
authLog.Debug("[Auth][Server] collect service access res", zap.Any("res", ret))
267+
if authLog.DebugEnabled() {
268+
authLog.Debug("[Auth][Server] collect service access res", zap.Any("res", ret))
269+
}
266270
return ret
267271
}
268272

@@ -277,9 +281,11 @@ func (svr *serverAuthAbility) queryServiceAliasResource(
277281
svcSet := model.NewServiceSet()
278282

279283
for index := range req {
280-
names.Add(req[index].Namespace.GetValue())
281-
alias := svr.Cache().Service().GetServiceByName(req[index].Alias.GetValue(),
282-
req[index].AliasNamespace.GetValue())
284+
aliasSvcName := req[index].GetAlias().GetValue()
285+
aliasSvcNamespace := req[index].GetAliasNamespace().GetValue()
286+
svcNamespace := req[index].GetNamespace().GetValue()
287+
names.Add(svcNamespace)
288+
alias := svr.Cache().Service().GetServiceByName(aliasSvcName, aliasSvcNamespace)
283289
if alias != nil {
284290
svc := svr.Cache().Service().GetServiceByID(alias.Reference)
285291
if svc != nil {
@@ -289,7 +295,9 @@ func (svr *serverAuthAbility) queryServiceAliasResource(
289295
}
290296

291297
ret := svr.convertToDiscoverResourceEntryMaps(names, svcSet)
292-
authLog.Debug("[Auth][Server] collect service alias access res", zap.Any("res", ret))
298+
if authLog.DebugEnabled() {
299+
authLog.Debug("[Auth][Server] collect service alias access res", zap.Any("res", ret))
300+
}
293301
return ret
294302
}
295303

@@ -305,14 +313,15 @@ func (svr *serverAuthAbility) queryInstanceResource(
305313
svcSet := model.NewServiceSet()
306314

307315
for index := range req {
316+
svcName := req[index].GetService().GetValue()
317+
svcNamespace := req[index].GetNamespace().GetValue()
308318
item := req[index]
309-
if item.Namespace.GetValue() != "" && item.Service.GetValue() != "" {
310-
svc := svr.Cache().Service().GetServiceByName(req[index].Service.GetValue(),
311-
req[index].Namespace.GetValue())
319+
if svcNamespace != "" && svcName != "" {
320+
svc := svr.Cache().Service().GetServiceByName(svcName, svcNamespace)
312321
if svc != nil {
313322
svcSet.Add(svc)
314323
} else {
315-
names.Add(req[index].Namespace.GetValue())
324+
names.Add(svcNamespace)
316325
}
317326
} else {
318327
ins := svr.Cache().Instance().GetInstance(item.GetId().GetValue())
@@ -321,14 +330,16 @@ func (svr *serverAuthAbility) queryInstanceResource(
321330
if svc != nil {
322331
svcSet.Add(svc)
323332
} else {
324-
names.Add(req[index].Namespace.GetValue())
333+
names.Add(svcNamespace)
325334
}
326335
}
327336
}
328337
}
329338

330339
ret := svr.convertToDiscoverResourceEntryMaps(names, svcSet)
331-
authLog.Debug("[Auth][Server] collect instance access res", zap.Any("res", ret))
340+
if authLog.DebugEnabled() {
341+
authLog.Debug("[Auth][Server] collect instance access res", zap.Any("res", ret))
342+
}
332343
return ret
333344
}
334345

@@ -343,14 +354,17 @@ func (svr *serverAuthAbility) queryCircuitBreakerResource(
343354
svcSet := model.NewServiceSet()
344355

345356
for index := range req {
346-
svc := svr.Cache().Service().GetServiceByName(req[index].Service.GetValue(),
347-
req[index].Namespace.GetValue())
357+
svcName := req[index].GetService().GetValue()
358+
svcNamespace := req[index].GetNamespace().GetValue()
359+
svc := svr.Cache().Service().GetServiceByName(svcName, svcNamespace)
348360
if svc != nil {
349361
svcSet.Add(svc)
350362
}
351363
}
352364
ret := svr.convertToDiscoverResourceEntryMaps(names, svcSet)
353-
authLog.Debug("[Auth][Server] collect circuit-breaker access res", zap.Any("res", ret))
365+
if authLog.DebugEnabled() {
366+
authLog.Debug("[Auth][Server] collect circuit-breaker access res", zap.Any("res", ret))
367+
}
354368
return ret
355369
}
356370

@@ -365,15 +379,18 @@ func (svr *serverAuthAbility) queryCircuitBreakerReleaseResource(
365379
svcSet := model.NewServiceSet()
366380

367381
for index := range req {
368-
svc := svr.Cache().Service().GetServiceByName(req[index].Service.Name.GetValue(),
369-
req[index].Service.Namespace.GetValue())
382+
svcName := req[index].GetService().GetName().GetValue()
383+
svcNamespace := req[index].GetService().GetNamespace().GetValue()
384+
svc := svr.Cache().Service().GetServiceByName(svcName, svcNamespace)
370385
if svc != nil {
371386
svcSet.Add(svc)
372387
}
373388
}
374389

375390
ret := svr.convertToDiscoverResourceEntryMaps(names, svcSet)
376-
authLog.Debug("[Auth][Server] collect circuit-breaker-release access res", zap.Any("res", ret))
391+
if authLog.DebugEnabled() {
392+
authLog.Debug("[Auth][Server] collect circuit-breaker-release access res", zap.Any("res", ret))
393+
}
377394
return ret
378395
}
379396

@@ -388,15 +405,18 @@ func (svr *serverAuthAbility) queryRouteRuleResource(
388405
svcSet := model.NewServiceSet()
389406

390407
for index := range req {
391-
svc := svr.Cache().Service().GetServiceByName(req[index].Service.GetValue(),
392-
req[index].Namespace.GetValue())
408+
svcName := req[index].GetService().GetValue()
409+
svcNamespace := req[index].GetNamespace().GetValue()
410+
svc := svr.Cache().Service().GetServiceByName(svcName, svcNamespace)
393411
if svc != nil {
394412
svcSet.Add(svc)
395413
}
396414
}
397415

398416
ret := svr.convertToDiscoverResourceEntryMaps(names, svcSet)
399-
authLog.Debug("[Auth][Server] collect route-rule access res", zap.Any("res", ret))
417+
if authLog.DebugEnabled() {
418+
authLog.Debug("[Auth][Server] collect route-rule access res", zap.Any("res", ret))
419+
}
400420
return ret
401421
}
402422

@@ -411,15 +431,18 @@ func (svr *serverAuthAbility) queryRateLimitConfigResource(
411431
svcSet := model.NewServiceSet()
412432

413433
for index := range req {
414-
svc := svr.Cache().Service().GetServiceByName(req[index].Service.GetValue(),
415-
req[index].Namespace.GetValue())
434+
svcName := req[index].GetService().GetValue()
435+
svcNamespace := req[index].GetNamespace().GetValue()
436+
svc := svr.Cache().Service().GetServiceByName(svcName, svcNamespace)
416437
if svc != nil {
417438
svcSet.Add(svc)
418439
}
419440
}
420441

421442
ret := svr.convertToDiscoverResourceEntryMaps(names, svcSet)
422-
authLog.Debug("[Auth][Server] collect rate-limit access res", zap.Any("res", ret))
443+
if authLog.DebugEnabled() {
444+
authLog.Debug("[Auth][Server] collect rate-limit access res", zap.Any("res", ret))
445+
}
423446
return ret
424447
}
425448

‎store/mysql/common.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,11 @@ func checkDataBaseAffectedRows(result sql.Result, counts ...int64) error {
154154
}
155155

156156
// timeToTimestamp 转时间戳（秒）
157-
// 由于 FROM_UNIXTIME 不支持负数，所以小于0的情况赋值为0
157+
// 由于 FROM_UNIXTIME 不支持负数，所以小于0的情况赋值为 1
158158
func timeToTimestamp(t time.Time) int64 {
159159
ts := t.Unix()
160160
if ts < 0 {
161-
ts = 0
161+
ts = 1
162162
}
163163
return ts
164164
}

0 commit comments

Comments
 (0)