Skip to content

feat: support to use upstream_id in stream_route#4121

Merged
tokers merged 5 commits intoapache:masterfrom
tokers:feat/upstream-id-in-stream-route
May 6, 2021
Merged

feat: support to use upstream_id in stream_route#4121
tokers merged 5 commits intoapache:masterfrom
tokers:feat/upstream-id-in-stream-route

Conversation

@tokers
Copy link
Copy Markdown
Contributor

@tokers tokers commented Apr 24, 2021

What this PR does / why we need it:

Currently, we can only use upstream inside stream_route, although upstream_id is a valid field in it, it's not used totally.

Pre-submission checklist:

  • Did you explain what problem does this PR solve? Or what new features have been added?
  • Have you added corresponding test cases?
  • Have you modified the corresponding document?
  • Is this PR backward compatible? If it is not backward compatible, please discuss on the mailing list first

@tokers tokers marked this pull request as draft April 24, 2021 06:12
@tokers tokers linked an issue Apr 24, 2021 that may be closed by this pull request
@tokers tokers marked this pull request as ready for review April 27, 2021 06:07
@tokers tokers requested review from membphis and spacewander April 27, 2021 06:08
@tokers
Copy link
Copy Markdown
Contributor Author

tokers commented Apr 30, 2021

Ping @membphis Please take a look.

@membphis
Copy link
Copy Markdown
Member

membphis commented May 5, 2021

@tokers you need to resolve the conflict files

Copy link
Copy Markdown
Member

@membphis membphis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can merge this PR after resolving the conflict files

if err then
core.log.error("failed to get resolved upstream: ", err)
if is_http then
return core.response.exit(500)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

origin code return 500 http status code

@tokers
Copy link
Copy Markdown
Contributor Author

tokers commented May 6, 2021

@membphis Conflicts resolved.

@tokers tokers merged commit 3a3874a into apache:master May 6, 2021
@tokers tokers deleted the feat/upstream-id-in-stream-route branch May 6, 2021 02:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

bug: upstream_id in stream_route is ineffective.

4 participants