Skip to content

Commit

Permalink
feat: add log for resolver and dynconfig (#2945)
Browse files Browse the repository at this point in the history
Signed-off-by: Gaius <[email protected]>
  • Loading branch information
gaius-qi authored Dec 15, 2023
1 parent e7c8703 commit 1643750
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion internal/dynconfig/dynconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func (d *dynconfig[T]) Get() (*T, error) {
func (d *dynconfig[T]) load() error {
// If another load is in progress, return directly.
if !d.mu.TryLock() {
return errors.New("another load is in progress")
return errors.New("load is running")
}
defer d.mu.Unlock()

Expand Down
3 changes: 3 additions & 0 deletions pkg/resolver/scheduler_resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ func (r *SchedulerResolver) Build(target resolver.Target, cc resolver.ClientConn
func (r *SchedulerResolver) ResolveNow(resolver.ResolveNowOptions) {
// Avoid concurrent GetResolveSchedulerAddrs calls.
if !r.mu.TryLock() {
plogger.Warning("resolve addresses is running")
return
}
defer r.mu.Unlock()
Expand All @@ -94,6 +95,8 @@ func (r *SchedulerResolver) ResolveNow(resolver.ResolveNowOptions) {
}); err != nil {
plogger.Errorf("resolver update ClientConn error %v", err)
}

plogger.Infof("resolve addresses %v", addrs)
}

// Close closes the resolver.
Expand Down
3 changes: 3 additions & 0 deletions pkg/resolver/seed_peer_resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ func (r *SeedPeerResolver) Build(target resolver.Target, cc resolver.ClientConn,
func (r *SeedPeerResolver) ResolveNow(resolver.ResolveNowOptions) {
// Avoid concurrent GetResolveSeedPeerAddrs calls.
if !r.mu.TryLock() {
slogger.Warning("resolve addresses is running")
return
}
defer r.mu.Unlock()
Expand All @@ -95,6 +96,8 @@ func (r *SeedPeerResolver) ResolveNow(resolver.ResolveNowOptions) {
}); err != nil {
slogger.Errorf("resolver update ClientConn error %v", err)
}

slogger.Infof("resolve addresses %v", addrs)
}

// Close closes the resolver.
Expand Down
5 changes: 5 additions & 0 deletions pkg/rpc/interceptor.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"google.golang.org/grpc/status"

"d7y.io/dragonfly/v2/internal/dferrors"
logger "d7y.io/dragonfly/v2/internal/dflog"
)

var (
Expand Down Expand Up @@ -73,6 +74,8 @@ func RefresherUnaryClientInterceptor(r Refresher) grpc.UnaryClientInterceptor {
err := invoker(ctx, method, req, reply, cc, opts...)
if s, ok := status.FromError(err); ok {
if s.Code() == codes.ResourceExhausted || s.Code() == codes.Unavailable {
logger.Errorf("refresh dynconfig addresses when unary client calling error: %s %#v %v", method, req, err)

// nolint
r.Refresh()
}
Expand All @@ -88,6 +91,8 @@ func RefresherStreamClientInterceptor(r Refresher) grpc.StreamClientInterceptor
clientStream, err := streamer(ctx, desc, cc, method, opts...)
if s, ok := status.FromError(err); ok {
if s.Code() == codes.ResourceExhausted || s.Code() == codes.Unavailable {
logger.Errorf("refresh dynconfig addresses when stream clinet calling error: %s %v", method, err)

// nolint
r.Refresh()
}
Expand Down
1 change: 1 addition & 0 deletions scheduler/config/dynconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ func (d *dynconfig) GetSchedulerClusterClientConfig() (types.SchedulerClusterCli
func (d *dynconfig) Refresh() error {
// If another load is in progress, return directly.
if !d.mu.TryLock() {
logger.Warn("refresh is running")
return nil
}
defer d.mu.Unlock()
Expand Down

0 comments on commit 1643750

Please sign in to comment.