diff --git a/redisbench_admin/environments/oss_standalone.py b/redisbench_admin/environments/oss_standalone.py index e8bf0d7..5434197 100644 --- a/redisbench_admin/environments/oss_standalone.py +++ b/redisbench_admin/environments/oss_standalone.py @@ -19,6 +19,7 @@ def spin_up_local_redis( local_module_files, configuration_parameters=None, dbdir_folder=None, + dataset_load_timeout_secs=120, ): command = generate_standalone_redis_server_args( binary, dbdir, local_module_files, port, configuration_parameters @@ -30,7 +31,7 @@ def spin_up_local_redis( ) ) redis_process = subprocess.Popen(command) - result = wait_for_conn(redis.StrictRedis(port=port)) + result = wait_for_conn(redis.StrictRedis(port=port), dataset_load_timeout_secs) if result is True: logging.info("Redis available") return [redis_process] diff --git a/redisbench_admin/run_local/run_local.py b/redisbench_admin/run_local/run_local.py index 40b9701..c2d2252 100644 --- a/redisbench_admin/run_local/run_local.py +++ b/redisbench_admin/run_local/run_local.py @@ -162,6 +162,12 @@ def run_local_command_logic(args, project_name, project_version): ) cluster_api_enabled = False + logging.info( + "Using a dataset load timeout of {} seconds.".format( + dataset_load_timeout_secs + ) + ) + if setup_type == "oss-cluster": cluster_api_enabled = True # pass @@ -205,6 +211,7 @@ def run_local_command_logic(args, project_name, project_version): local_module_file, redis_configuration_parameters, dbdir_folder, + dataset_load_timeout_secs, ) for redis_process in redis_processes: