Skip to content

Using dbconfig.dataset_load_timeout_secs on run-local for standalone setups #168

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jul 29, 2021
Merged

Using dbconfig.dataset_load_timeout_secs on run-local for standalone setups #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0d2c70
[fix] Using dbconfig.dataset_load_timeout_secs on run-local
filipecosta90 Jul 29, 2021
0b179cd
Bumping version from 0.3.6 to 0.3.7
filipecosta90 Jul 29, 2021
f86f489
Merge remote-tracking branch 'origin/master' into dbconfig.dataset_lo…
filipecosta90 Jul 29, 2021
4ef0ba5
[fix] Using dbconfig.dataset_load_timeout_secs on run-local
filipecosta90 Jul 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion redisbench_admin/environments/oss_standalone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]
Expand Down
7 changes: 7 additions & 0 deletions redisbench_admin/run_local/run_local.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down