diff options
Diffstat (limited to 'resources/libraries/python')
| -rw-r--r-- | resources/libraries/python/Constants.py | 12 | ||||
| -rw-r--r-- | resources/libraries/python/HoststackUtil.py | 11 | ||||
| -rw-r--r-- | resources/libraries/python/TrafficGenerator.py | 4 |
3 files changed, 24 insertions, 3 deletions
diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index 443bdfc646..f2191a9211 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -269,6 +269,18 @@ class Constants: # Whether to use latency streams in main search trials. PERF_USE_LATENCY = get_pessimistic_bool_from_env("PERF_USE_LATENCY") + # Whether to apply low-load trial to avoid flooding other machines. + INFRA_WARMUP_DURATION = get_float_from_env("INFRA_WARMUP_DURATION", 0) + + # Load just high enough to show all MAC addresses. + INFRA_WARMUP_RATE = get_float_from_env("INFRA_WARMUP_RATE", 300.0) + + # Whether to warm-up the traffic generator with high load. + TG_WARMUP_DURATION = get_float_from_env("TG_WARMUP_DURATION", 1.0) + + ## TG warmup load tweaking should not be needed, default max rate is best. + #TG_WARMUP_RATE = get_float_from_env("TG_WARMUP_RATE") + # Duration of one latency-specific trial in NDRPDR test. PERF_TRIAL_LATENCY_DURATION = get_float_from_env( "PERF_TRIAL_LATENCY_DURATION", 5.0 diff --git a/resources/libraries/python/HoststackUtil.py b/resources/libraries/python/HoststackUtil.py index 3ada07b2a4..cb3970ff0c 100644 --- a/resources/libraries/python/HoststackUtil.py +++ b/resources/libraries/python/HoststackUtil.py @@ -285,7 +285,7 @@ class HoststackUtil(): # NGINX used `worker_cpu_affinity` in configuration file taskset_cmd = u"" if program_name == u"nginx" else \ f"taskset --cpu-list {core_list}" - cmd = f"nohup {shell_cmd} \'{env_vars}{taskset_cmd} " \ + cmd = f"nohup {taskset_cmd} {shell_cmd} \'{env_vars} " \ f"{program_path}{program_name} {args} >/tmp/{program_name}_" \ f"stdout.log 2>/tmp/{program_name}_stderr.log &\'" try: @@ -322,6 +322,15 @@ class HoststackUtil(): exec_cmd_no_error(node, cmd, message=errmsg, sudo=True) @staticmethod + def sleep_for_hoststack_test_duration(sleep_time): + """Wait for the HostStack test program process to complete. + + :param sleep_time: waiting stecific time. + """ + logger.info(f"Sleeping for {sleep_time} seconds") + sleep(sleep_time + 1) + + @staticmethod def hoststack_test_program_finished(node, program_pid, program, other_node, other_program): """Wait for the specified HostStack test program process to complete. diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index ae01f8d3a6..fe9db3cb72 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Cisco and/or its affiliates. +# Copyright (c) 2025 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -1590,7 +1590,7 @@ class OptimizedSearch: config.min_load = min_load config.max_load = max_load config.search_duration_max = search_duration_max - config.warmup_duration = 1.0 + config.warmup_duration = 0.0 algorithm = MultipleLossRatioSearch(config) results = algorithm.search(measurer=tg_instance, debug=logger.debug) return [results[goal] for goal in goals] |