From fe0397c6e81dc87720a7ccacbd801ec1bbab0157 Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Tue, 23 Jan 2024 16:31:43 -0800 Subject: [PATCH 1/3] Gamma tests: redistribute startTestClient wait times --- framework/xds_gamma_testcase.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/framework/xds_gamma_testcase.py b/framework/xds_gamma_testcase.py index 0d86a15b..b492239f 100644 --- a/framework/xds_gamma_testcase.py +++ b/framework/xds_gamma_testcase.py @@ -127,11 +127,15 @@ def startTestClient( # test suites because they only start waiting after already waited for # the TD backends to be created and report healthy. # In GAMMA, these resources are created asynchronously by Kubernetes. - # To compensate for this, we double the timeout for GAMMA tests. + # To compensate for this, we double the timeout for the active ADS + # stream detection in GAMMA tests. Until the mesh is created, + # ADS calls are rejected with "NOT_FOUND: Requested entity was + # not found." return self._start_test_client( server_target, - wait_for_server_channel_ready_timeout=datetime.timedelta( - minutes=10 - ), + wait_for_active_ads_timeout=datetime.timedelta(minutes=10), + # TODO(sergiitk): consider decreasing to 2-3 minutes, since + # the majority of the wait time spent on waiting ADS. + wait_for_server_channel_ready_timeout=datetime.timedelta(minutes=5), **kwargs, ) From d3923b240d877d2ab5942b25f98d3eb8376adb1e Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Tue, 23 Jan 2024 16:57:35 -0800 Subject: [PATCH 2/3] keep wait_for_server_channel_ready_timeout higher The behavior seems to vary based on a cluster. --- framework/xds_gamma_testcase.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/xds_gamma_testcase.py b/framework/xds_gamma_testcase.py index b492239f..917f4ea9 100644 --- a/framework/xds_gamma_testcase.py +++ b/framework/xds_gamma_testcase.py @@ -134,8 +134,8 @@ def startTestClient( return self._start_test_client( server_target, wait_for_active_ads_timeout=datetime.timedelta(minutes=10), - # TODO(sergiitk): consider decreasing to 2-3 minutes, since - # the majority of the wait time spent on waiting ADS. - wait_for_server_channel_ready_timeout=datetime.timedelta(minutes=5), + # TODO(sergiitk): consider decreasing to 5 minutes, if the majority + # of the wait time spent on waiting ADS. + wait_for_server_channel_ready_timeout=datetime.timedelta(minutes=7), **kwargs, ) From 5386cde8b084efa3f715314e8eef7a6d26d55a27 Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Thu, 25 Jan 2024 12:32:20 -0800 Subject: [PATCH 3/3] Increase wait_for_server_channel_ready_timeout to 9 min --- framework/xds_gamma_testcase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/xds_gamma_testcase.py b/framework/xds_gamma_testcase.py index 917f4ea9..62fdb9e7 100644 --- a/framework/xds_gamma_testcase.py +++ b/framework/xds_gamma_testcase.py @@ -136,6 +136,6 @@ def startTestClient( wait_for_active_ads_timeout=datetime.timedelta(minutes=10), # TODO(sergiitk): consider decreasing to 5 minutes, if the majority # of the wait time spent on waiting ADS. - wait_for_server_channel_ready_timeout=datetime.timedelta(minutes=7), + wait_for_server_channel_ready_timeout=datetime.timedelta(minutes=9), **kwargs, )