-
Notifications
You must be signed in to change notification settings - Fork 4.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
config dump, listeners are added to warming list if workers are not started yet #7511
Conversation
Signed-off-by: Jianfei Hu <jianfeih@google.com>
/cc @silentdai @asraa @mattklein123 for review. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, this is low risk and makes sense to me. @asraa @silentdai any concerns?
Make perfect sense. Thank you! |
This looks good to me. Mind if you add in envoy/test/integration/ads_integration_test.cc Lines 968 to 971 in 79b071c
|
Waiting on @asraa comment. /wait |
Signed-off-by: Jianfei Hu <jianfeih@google.com>
@@ -969,6 +969,9 @@ TEST_P(AdsIntegrationTest, ListenerDrainBeforeServerStart) { | |||
Config::TypeUrl::get().Listener, {buildListener("listener_0", "route_config_0")}, | |||
{buildListener("listener_0", "route_config_0")}, {}, "1"); | |||
test_server_->waitForGaugeGe("listener_manager.total_listeners_active", 1); | |||
// Before server is started, even though listeners are added to active list | |||
// we mark them as "warming" in config dump since they're not initialized yet. | |||
EXPECT_EQ(getListenersConfigDump().dynamic_warming_listeners().size(), 1); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@asraa Done.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you!
/retest |
🔨 rebuilding |
/retest |
🔨 rebuilding |
Tests now all passed. @mattklein123 could you take another look or this is ready to go? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, will merge once 1.11 is cut.
Signed-off-by: Jianfei Hu jianfeih@google.com
For an explanation of how to fill out the fields, please see the relevant section
in PULL_REQUESTS.md
Description: Listeners config dump changed to warming_listeners if the workers are not started.
Risk Level: Low
Testing: Unit test, (existing unit test is good enough, with workers started before and after)
Docs Changes:
Release Notes: Listeners config dump changed to warming_listeners if the workers are not started.
[Optional Fixes #Issue] #6904
[Optional Deprecated:]