Skip to content

Commit b8645da

Browse files
authored
[Chassis] Reduce wait/timeout time for chassis (#16077)
Description of PR Cisco chassis used to be unstable months ago, so updated the wait time of sshd ready to 600s, and service ready to 900s. After the image became stable, we can reduce the time to: sshd ready: 420s service ready: 600s Will keep monitoring and see whether we can reduce the wait time to align with t0/t1 in the future. Approach What is the motivation for this PR? Cisco chassis used to be unstable months ago, so updated the wait time of sshd ready to 600s, and service ready to 900s. After the image became stable, we can reduce the time to: sshd ready: 420s service ready: 600s Will keep monitoring and see whether we can reduce the wait time to align with t0/t1 in the future. How did you do it? How did you verify/test it? In the nightly test, the configuration works well. Any platform specific information? Supported testbed topology if it's a new test case? Documentation co-authorized by: [email protected]
1 parent c4d6a7c commit b8645da

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

tests/common/config_reload.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ def _config_reload_cmd_wrapper(cmd, executable):
192192
sonic_host.shell(cmd, executable="/bin/bash")
193193

194194
modular_chassis = sonic_host.get_facts().get("modular_chassis")
195-
wait = max(wait, 900) if modular_chassis else wait
195+
wait = max(wait, 600) if modular_chassis else wait
196196

197197
if safe_reload:
198198
# The wait time passed in might not be guaranteed to cover the actual

tests/common/plugins/sanity_check/checks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def _check_interfaces_on_dut(*args, **kwargs):
110110
networking_uptime = dut.get_networking_uptime().seconds
111111
timeout = max((SYSTEM_STABILIZE_MAX_TIME - networking_uptime), 0)
112112
if dut.get_facts().get("modular_chassis"):
113-
timeout = max(timeout, 900)
113+
timeout = max(timeout, 600)
114114
interval = 20
115115
logger.info("networking_uptime=%d seconds, timeout=%d seconds, interval=%d seconds" %
116116
(networking_uptime, timeout, interval))
@@ -259,7 +259,7 @@ def _check_bgp_status_helper():
259259
else:
260260
max_timeout = SYSTEM_STABILIZE_MAX_TIME - networking_uptime + 480
261261
if dut.get_facts().get("modular_chassis"):
262-
max_timeout = max(max_timeout, 900)
262+
max_timeout = max(max_timeout, 600)
263263
timeout = max(max_timeout, 1)
264264
interval = 20
265265
wait_until(timeout, interval, 0, _check_bgp_status_helper)

tests/common/reboot.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,8 @@ def reboot(duthost, localhost, reboot_type='cold', delay=10,
263263
if warmboot_finalizer_timeout == 0 and 'warmboot_finalizer_timeout' in reboot_ctrl:
264264
warmboot_finalizer_timeout = reboot_ctrl['warmboot_finalizer_timeout']
265265
if duthost.get_facts().get("modular_chassis") and safe_reboot:
266-
wait = max(wait, 900)
267-
timeout = max(timeout, 600)
266+
wait = max(wait, 600)
267+
timeout = max(timeout, 420)
268268
except KeyError:
269269
raise ValueError('invalid reboot type: "{} for {}"'.format(reboot_type, hostname))
270270
logger.info('Reboot {}: wait[{}], timeout[{}]'.format(hostname, wait, timeout))

tests/tacacs/test_ro_disk.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ def do_reboot(duthost, localhost, duthosts):
104104
def post_reboot_healthcheck(duthost, localhost, duthosts, wait_time):
105105
timeout = 300
106106
if duthost.get_facts().get("modular_chassis"):
107-
wait_time = max(wait_time, 900)
108-
timeout = max(timeout, 600)
107+
wait_time = max(wait_time, 600)
108+
timeout = max(timeout, 420)
109109
localhost.wait_for(host=duthost.mgmt_ip, port=22, state="started", delay=10, timeout=timeout)
110110
else:
111111
localhost.wait_for(host=duthost.mgmt_ip, port=22, state="started", delay=10, timeout=timeout)

0 commit comments

Comments
 (0)