fix(consul): support to fetch only health endpoint #9204
Merged
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
added 10 commits
March 30, 2023 14:13
|
@tokers @spacewander @tzssangglass Please take a look at this PR, thanks |
|
@liuxiran Could you return CI? some other test error, which is not I add |
added 2 commits
April 5, 2023 00:00
|
@Fabriceli The ci has been reruned |
|
@monkeyDluffy6017 Please take a look at this PR, thanks |
|
@monkeyDluffy6017 The CI is not very stable,could you re-run the CI? |
…t_health_endpoint
|
Hi @Fabriceli, thank you for all your hard work! |
leslie-tsang
reviewed
May 3, 2023
apisix/discovery/consul/init.lua
Outdated
| if watch_error_info then | ||
| log.error("connect consul: ", consul_server.consul_server_url, | ||
| " by sub url: ", consul_server.consul_watch_health_url, | ||
| ", got watch result: ", json_delay_encode(watch_result, true), |
There was a problem hiding this comment.
Suggested change
| ", got watch result: ", json_delay_encode(watch_result, true), | |
| ", got watch result: ", json_delay_encode(watch_result, true), |
No need for json_delay_encode as the log level is error by default ?
There was a problem hiding this comment.
you are right, done
There was a problem hiding this comment.
Suggested change
| ", got watch result: ", json_delay_encode(watch_result, true), | |
| ", got watch result: ", json_encode(watch_result, true), |
Sry for the mistake, we can use json_encode instead of json_delay_encode here. WDYT ?
monkeyDluffy6017
approved these changes
May 4, 2023
leslie-tsang
approved these changes
May 4, 2023
5 tasks
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.
Description
Thank you for your previous work @dyrnq
Create TWO threads to watch the catalog services and health services:
flowchart TD subgraph Thread 1: watch catalog A[Start] --> catalog{Catalog any change?} catalog -->|Yes| cindex[return catalog index] catalog ---->|No| cblock[block query until catalog any change] cblock --> E[End] cindex --> E end subgraph Thread 2: watch health A2[Start] --> health2{health any change?} health2 -->|Yes| hindex[return health index] health2 ---->|No| hblock[block query until health any change] hblock --> E2[End] hindex --> E2 end subgraph Wait any thread A3[Start] --> spawn[Spawn TWO threads] spawn --> wait[wait any Thread] wait --> catalog2[Query all services] catalog2 --> H[Query health nodes] H --> update[Update all services] update --> e[End] endFixes # (issue)
Reference: #8856, #8928
Checklist