Skip to content

Commit e8166e4

Browse files
authored
feat(client): removing hostname resolution fallback when the IP address check fails (#3936)
feat(client): remove check health for scheduler Signed-off-by: Gaius <gaius.qi@gmail.com>
1 parent f78cdee commit e8166e4

File tree

2 files changed

+9
-23
lines changed

2 files changed

+9
-23
lines changed

client/config/dynconfig_manager.go

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -119,28 +119,15 @@ func (d *dynconfigManager) GetResolveSchedulerAddrs() ([]resolver.Address, error
119119
dialOptions = append(dialOptions, grpc.WithTransportCredentials(insecure.NewCredentials()))
120120
}
121121

122-
var addr string
123-
if ip, ok := ip.FormatIP(scheduler.GetIp()); ok {
124-
// Check health with ip address.
125-
target := fmt.Sprintf("%s:%d", ip, scheduler.GetPort())
126-
if err := healthclient.Check(context.Background(), target, dialOptions...); err != nil {
127-
logger.Warnf("scheduler ip address %s is unreachable: %s", target, err.Error())
128-
129-
// Check health with host address.
130-
target = fmt.Sprintf("%s:%d", scheduler.GetHostname(), scheduler.GetPort())
131-
if err := healthclient.Check(context.Background(), target, dialOptions...); err != nil {
132-
logger.Warnf("scheduler host address %s is unreachable: %s", target, err.Error())
133-
} else {
134-
addr = target
135-
}
136-
} else {
137-
addr = target
138-
}
122+
ip, ok := ip.FormatIP(scheduler.GetIp())
123+
if !ok {
124+
logger.Warnf("invalid IP format for scheduler: %s", scheduler.GetIp())
125+
continue
139126
}
140127

141-
if addr == "" {
142-
logger.Warnf("scheduler %s %s %d has not reachable addresses",
143-
scheduler.GetIp(), scheduler.GetHostname(), scheduler.GetPort())
128+
addr := fmt.Sprintf("%s:%d", ip, scheduler.GetPort())
129+
if err := healthclient.Check(context.Background(), addr, dialOptions...); err != nil {
130+
logger.Warnf("scheduler %s is unreachable: %s", addr, err.Error())
144131
continue
145132
}
146133

client/config/dynconfig_manager_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,8 @@ func TestDynconfigManager_GetResolveSchedulerAddrs(t *testing.T) {
217217
},
218218
expect: func(t *testing.T, dynconfig Dynconfig, data *DynconfigData) {
219219
assert := assert.New(t)
220-
result, err := dynconfig.GetResolveSchedulerAddrs()
221-
assert.NoError(err)
222-
assert.EqualValues(result, []resolver.Address{{ServerName: "localhost", Addr: "localhost:3000"}})
220+
_, err := dynconfig.GetResolveSchedulerAddrs()
221+
assert.Error(err)
223222
},
224223
},
225224
{

0 commit comments

Comments
 (0)