Skip to content

Commit eb06464

Browse files
authored
feat: plugin log (#843)
Signed-off-by: Gaius <[email protected]>
1 parent c8af201 commit eb06464

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

internal/dflog/logger.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,12 @@ func WithTaskIDAndURL(taskID, url string) *SugaredLoggerOnWith {
112112
}
113113
}
114114

115+
func WithHostnameAndIP(hostname, ip string) *SugaredLoggerOnWith {
116+
return &SugaredLoggerOnWith{
117+
withArgs: []interface{}{"hostname", hostname, "ip", ip},
118+
}
119+
}
120+
115121
func (log *SugaredLoggerOnWith) Infof(template string, args ...interface{}) {
116122
CoreLogger.Infow(fmt.Sprintf(template, args...), log.withArgs...)
117123
}

manager/searcher/searcher.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,11 @@ type searcher struct{}
8181
func New() Searcher {
8282
s, err := LoadPlugin()
8383
if err != nil {
84+
logger.Info("use default searcher")
8485
return &searcher{}
8586
}
8687

88+
logger.Info("use searcher plugin")
8789
return s
8890
}
8991

@@ -99,7 +101,7 @@ func (s *searcher) FindSchedulerCluster(ctx context.Context, schedulerClusters [
99101
var clusters []model.SchedulerCluster
100102
securityDomain := conditions[ConditionSecurityDomain]
101103
if securityDomain == "" {
102-
logger.Infof("client %s %s have empty security domain", client.HostName, client.Ip)
104+
logger.Infof("dfdaemon %s %s have empty security domain", client.HostName, client.Ip)
103105
}
104106

105107
for _, schedulerCluster := range schedulerClusters {

manager/service/service_grpc.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -365,27 +365,32 @@ func (s *GRPC) UpdateScheduler(ctx context.Context, req *manager.UpdateScheduler
365365
}
366366

367367
func (s *GRPC) ListSchedulers(ctx context.Context, req *manager.ListSchedulersRequest) (*manager.ListSchedulersResponse, error) {
368+
log := logger.WithHostnameAndIP(req.HostName, req.Ip)
369+
368370
var pbListSchedulersResponse manager.ListSchedulersResponse
369371
cacheKey := cache.MakeSchedulersCacheKey(req.HostName, req.Ip)
370372

371373
// Cache Hit
372374
if err := s.cache.Get(ctx, cacheKey, &pbListSchedulersResponse); err == nil {
373-
logger.Infof("%s cache hit", cacheKey)
375+
log.Infof("%s cache hit", cacheKey)
374376
return &pbListSchedulersResponse, nil
375377
}
376378

377379
// Cache Miss
378-
logger.Infof("%s cache miss", cacheKey)
380+
log.Infof("%s cache miss", cacheKey)
379381
var schedulerClusters []model.SchedulerCluster
380382
if err := s.db.WithContext(ctx).Preload("SecurityGroup.SecurityRules").Preload("Schedulers", "state = ?", "active").Find(&schedulerClusters).Error; err != nil {
381383
return nil, status.Error(codes.Unknown, err.Error())
382384
}
383385

384386
// Search optimal scheduler cluster
387+
log.Infof("list scheduler clusters %+v with hostInfo %+v", schedulerClusters, req.HostInfo)
385388
schedulerCluster, ok := s.searcher.FindSchedulerCluster(ctx, schedulerClusters, req)
386389
if !ok {
390+
log.Errorf("can not matching scheduler cluster")
387391
return nil, status.Error(codes.NotFound, "scheduler cluster not found")
388392
}
393+
log.Infof("find matching scheduler cluster %v", schedulerCluster)
389394

390395
schedulers := []model.Scheduler{}
391396
if err := s.db.WithContext(ctx).Find(&schedulers, &model.Scheduler{
@@ -421,7 +426,7 @@ func (s *GRPC) ListSchedulers(ctx context.Context, req *manager.ListSchedulersRe
421426
Value: &pbListSchedulersResponse,
422427
TTL: s.cache.TTL,
423428
}); err != nil {
424-
logger.Warnf("storage cache failed: %v", err)
429+
log.Warnf("storage cache failed: %v", err)
425430
}
426431

427432
return &pbListSchedulersResponse, nil

0 commit comments

Comments
 (0)