fix: when there is a non-ip IPAddr in Eureka, delete it to avoid a failure in EDS #1322
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lcfang
requested review from
NameHaibinZhang,
2456868764 and
johnlanni
as code owners
|
|
CH3CHO
requested changes
Sep 19, 2024
CH3CHO
requested changes
Sep 20, 2024
| break | ||
| } | ||
| } | ||
| if shouldDelete == true { |
|
|
||
| var ( | ||
| keysToDelete []string | ||
| shouldDelete bool |
There was a problem hiding this comment.
这个变量是不是没必要放这么外面呀，留在for里面就行了
| for name, app := range apps { | ||
| shouldDelete = false | ||
| for _, instant := range app.Instances { |
| @@ -128,14 +129,34 @@ func (c *eurekaHttpClient) getApplications(path string) (*Applications, error) { | |||
| app := rj.Response.Applications[idx] | |||
| apps[app.Name] = app | |||
There was a problem hiding this comment.
看了一下，是不是直接把下面的逻辑放到这个循环里就行了。。。
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1322 +/- ##
==========================================
+ Coverage 35.91% 44.21% +8.30%
==========================================
Files 69 76 +7
Lines 11576 9895 -1681
==========================================
+ Hits 4157 4375 +218
+ Misses 7104 5184 -1920
- Partials 315 336 +21 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ⅰ. Describe what this PR did
当eureka中注册的服务IPAddr为域名而非ip时，会导致其他EDS下发失败，故打印waring并忽略该应用
Ⅱ. Does this pull request fix one issue?
fixes #1284
fixes #1299
Ⅲ. Why don't you add test cases (unit test/integration test)?
Ⅳ. Describe how to verify it
在启动higress之前往eureka注册中心注册一个服务，ipaddr为域名而非ip，修复前查看配置下发是失败的，修复后不报错，controller中有waring日志
Ⅴ. Special notes for reviews