Skip to content

upstream: Add HttpPoolData methods required by Nighthawk.#16865

Merged
alyssawilk merged 1 commit intoenvoyproxy:mainfrom
mum4k:pool_methods
Jun 8, 2021
Merged

upstream: Add HttpPoolData methods required by Nighthawk.#16865
alyssawilk merged 1 commit intoenvoyproxy:mainfrom
mum4k:pool_methods

Conversation

@mum4k
Copy link
Copy Markdown
Contributor

@mum4k mum4k commented Jun 8, 2021

A recent change (#16544) moved the Http::ConnectionPool::Instance* returned from ThreadLocalCluster::httpConnPool() behind a new class HttpPoolData which no longer exposes the pool instance.

A temporary workaround was added to Nighthawk's code here to support the this code.

This PR adds two new methods on HttpPoolData to allow the removal of said workaround - hasActiveConnections and addDrainedCallback. Both just forward the call to the underlying pool.

Risk Level: low, existing functionality isn't affected.
Testing: n/a, only accessor method added.
Docs Changes: n/a.
Release Notes: n/a.

Signed-off-by: Jakub Sobon mumak@google.com

Signed-off-by: Jakub Sobon <mumak@google.com>
@mum4k
Copy link
Copy Markdown
Contributor Author

mum4k commented Jun 8, 2021

@alyssawilk this PR attempts to pave a path towards the removal of the workaround in Nighthawk. I would appreciate if you could take a look.

@alyssawilk alyssawilk self-assigned this Jun 8, 2021
@alyssawilk alyssawilk merged commit b250dd2 into envoyproxy:main Jun 8, 2021
@mum4k mum4k deleted the pool_methods branch June 8, 2021 16:44
mum4k added a commit to mum4k/nighthawk that referenced this pull request Jun 8, 2021
- Removing reference to header file `transport_sockets/well_known_names.h` that was deleted by Envoy (envoyproxy/envoy@97d4792).
- Undoing temporary workaround for Nighthawk's pool access now that envoyproxy/envoy#16865 was merged in.

Fixes envoyproxy#695.

Signed-off-by: Jakub Sobon <mumak@google.com>
mum4k added a commit to envoyproxy/nighthawk that referenced this pull request Jun 8, 2021
- Removing reference to header file `transport_sockets/well_known_names.h` that was deleted by Envoy (envoyproxy/envoy@97d4792).
- Undoing temporary workaround for Nighthawk's pool access now that envoyproxy/envoy#16865 was merged in.

Fixes #695.

Signed-off-by: Jakub Sobon <mumak@google.com>
leyao-daily pushed a commit to leyao-daily/envoy that referenced this pull request Sep 30, 2021
A recent change (envoyproxy#16544) moved the Http::ConnectionPool::Instance* returned from ThreadLocalCluster::httpConnPool() behind a new class HttpPoolData which no longer exposes the pool instance.

This PR adds two new methods on HttpPoolData to allow the removal of said workaround - hasActiveConnections and addDrainedCallback. Both just forward the call to the underlying pool.

Risk Level: low, existing functionality isn't affected.
Testing: n/a, only accessor method added.
Docs Changes: n/a.
Release Notes: n/a.

Signed-off-by: Jakub Sobon <mumak@google.com>
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.

2 participants