Skip to content

Commit 1a87bfc

Browse files
authored
refactor: remove unused seed peer related logic (#4259)
Signed-off-by: chlins <chlins.zhang@gmail.com>
1 parent bd2ae63 commit 1a87bfc

File tree

5 files changed

+1
-483
lines changed

5 files changed

+1
-483
lines changed

pkg/resolver/seed_peer_resolver.go

Lines changed: 0 additions & 111 deletions
This file was deleted.

pkg/rpc/cdnsystem/client/client.go

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,14 @@ import (
2828
grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
2929
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
3030
"google.golang.org/grpc"
31-
"google.golang.org/grpc/balancer"
3231

3332
cdnsystemv1 "d7y.io/api/v2/pkg/apis/cdnsystem/v1"
3433
commonv1 "d7y.io/api/v2/pkg/apis/common/v1"
3534

3635
logger "d7y.io/dragonfly/v2/internal/dflog"
3736
pkgbalancer "d7y.io/dragonfly/v2/pkg/balancer"
3837
"d7y.io/dragonfly/v2/pkg/dfnet"
39-
"d7y.io/dragonfly/v2/pkg/resolver"
4038
"d7y.io/dragonfly/v2/pkg/rpc"
41-
"d7y.io/dragonfly/v2/scheduler/config"
4239
)
4340

4441
const (
@@ -89,51 +86,6 @@ func GetClientByAddr(ctx context.Context, netAddr dfnet.NetAddr, opts ...grpc.Di
8986
}, nil
9087
}
9188

92-
func GetClient(ctx context.Context, dynconfig config.DynconfigInterface, opts ...grpc.DialOption) (Client, error) {
93-
// Register resolver and balancer.
94-
resolver.RegisterSeedPeer(dynconfig)
95-
builder, pickerBuilder := pkgbalancer.NewConsistentHashingBuilder()
96-
balancer.Register(builder)
97-
98-
conn, err := grpc.DialContext(
99-
ctx,
100-
resolver.SeedPeerVirtualTarget,
101-
append([]grpc.DialOption{
102-
grpc.WithIdleTimeout(0),
103-
grpc.WithDefaultCallOptions(
104-
grpc.MaxCallRecvMsgSize(math.MaxInt32),
105-
grpc.MaxCallSendMsgSize(math.MaxInt32),
106-
),
107-
grpc.WithDefaultServiceConfig(pkgbalancer.BalancerServiceConfig),
108-
grpc.WithUnaryInterceptor(grpc_middleware.ChainUnaryClient(
109-
rpc.ConvertErrorUnaryClientInterceptor,
110-
grpc_prometheus.UnaryClientInterceptor,
111-
grpc_zap.UnaryClientInterceptor(logger.GrpcLogger.Desugar()),
112-
grpc_retry.UnaryClientInterceptor(
113-
grpc_retry.WithMax(maxRetries),
114-
grpc_retry.WithBackoff(grpc_retry.BackoffLinear(backoffWaitBetween)),
115-
),
116-
rpc.RefresherUnaryClientInterceptor(dynconfig),
117-
)),
118-
grpc.WithStreamInterceptor(grpc_middleware.ChainStreamClient(
119-
rpc.ConvertErrorStreamClientInterceptor,
120-
grpc_prometheus.StreamClientInterceptor,
121-
grpc_zap.StreamClientInterceptor(logger.GrpcLogger.Desugar()),
122-
rpc.RefresherStreamClientInterceptor(dynconfig),
123-
)),
124-
}, opts...)...,
125-
)
126-
if err != nil {
127-
return nil, err
128-
}
129-
130-
return &client{
131-
SeederClient: cdnsystemv1.NewSeederClient(conn),
132-
ClientConn: conn,
133-
ConsistentHashingPickerBuilder: pickerBuilder,
134-
}, nil
135-
}
136-
13789
// Client is the interface for grpc client.
13890
type Client interface {
13991
// ObtainSeeds triggers the seed peer to download task back-to-source..

pkg/rpc/dfdaemon/client/client_v2.go

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -27,63 +27,15 @@ import (
2727
grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
2828
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
2929
"google.golang.org/grpc"
30-
"google.golang.org/grpc/balancer"
3130
"google.golang.org/grpc/credentials/insecure"
3231

3332
commonv2 "d7y.io/api/v2/pkg/apis/common/v2"
3433
dfdaemonv2 "d7y.io/api/v2/pkg/apis/dfdaemon/v2"
3534

3635
logger "d7y.io/dragonfly/v2/internal/dflog"
3736
pkgbalancer "d7y.io/dragonfly/v2/pkg/balancer"
38-
"d7y.io/dragonfly/v2/pkg/resolver"
39-
"d7y.io/dragonfly/v2/pkg/rpc"
40-
"d7y.io/dragonfly/v2/scheduler/config"
4137
)
4238

43-
// GetV2 returns v2 version of the dfdaemon client.
44-
func GetV2(ctx context.Context, dynconfig config.DynconfigInterface, opts ...grpc.DialOption) (V2, error) {
45-
// Register resolver and balancer.
46-
resolver.RegisterSeedPeer(dynconfig)
47-
builder, pickerBuilder := pkgbalancer.NewConsistentHashingBuilder()
48-
balancer.Register(builder)
49-
50-
conn, err := grpc.DialContext(
51-
ctx,
52-
resolver.SeedPeerVirtualTarget,
53-
append([]grpc.DialOption{
54-
grpc.WithIdleTimeout(0),
55-
grpc.WithDefaultCallOptions(
56-
grpc.MaxCallRecvMsgSize(math.MaxInt32),
57-
grpc.MaxCallSendMsgSize(math.MaxInt32),
58-
),
59-
grpc.WithDefaultServiceConfig(pkgbalancer.BalancerServiceConfig),
60-
grpc.WithUnaryInterceptor(grpc_middleware.ChainUnaryClient(
61-
grpc_prometheus.UnaryClientInterceptor,
62-
grpc_zap.UnaryClientInterceptor(logger.GrpcLogger.Desugar()),
63-
grpc_retry.UnaryClientInterceptor(
64-
grpc_retry.WithMax(maxRetries),
65-
grpc_retry.WithBackoff(grpc_retry.BackoffLinear(backoffWaitBetween)),
66-
),
67-
rpc.RefresherUnaryClientInterceptor(dynconfig),
68-
)),
69-
grpc.WithStreamInterceptor(grpc_middleware.ChainStreamClient(
70-
grpc_prometheus.StreamClientInterceptor,
71-
grpc_zap.StreamClientInterceptor(logger.GrpcLogger.Desugar()),
72-
rpc.RefresherStreamClientInterceptor(dynconfig),
73-
)),
74-
}, opts...)...,
75-
)
76-
if err != nil {
77-
return nil, err
78-
}
79-
80-
return &v2{
81-
DfdaemonUploadClient: dfdaemonv2.NewDfdaemonUploadClient(conn),
82-
ClientConn: conn,
83-
ConsistentHashingPickerBuilder: pickerBuilder,
84-
}, nil
85-
}
86-
8739
// GetV2ByAddr returns v2 version of the dfdaemon client by address.
8840
func GetV2ByAddr(ctx context.Context, target string, opts ...grpc.DialOption) (V2, error) {
8941
conn, err := grpc.DialContext(

0 commit comments

Comments
 (0)