Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "redisbench-admin"
version = "0.1.61"
version = "0.1.62"
description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
authors = ["filipecosta90 <filipecosta.90@gmail.com>"]
readme = "README.md"
Expand Down
1 change: 1 addition & 0 deletions redisbench_admin/run_remote/run_remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ def run_remote_command_logic(args):
benchmark_min_tool_version_minor,
benchmark_min_tool_version_patch,
benchmark_tool,
benchmark_tool_source,
) = extract_benchmark_tool_settings(benchmark_config)
if benchmark_tool is not None:
logging.info(
Expand Down
15 changes: 11 additions & 4 deletions redisbench_admin/utils/remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@ def setup_remote_environment(
)
_, _, _ = tf.refresh()
tf_output = tf.output()
server_private_ip = tf_output["server_private_ip"]["value"][0]
server_public_ip = tf_output["server_public_ip"]["value"][0]
client_private_ip = tf_output["client_private_ip"]["value"][0]
client_public_ip = tf_output["client_public_ip"]["value"][0]
server_private_ip = tf_output_or_none(tf_output, "server_private_ip")
server_public_ip = tf_output_or_none(tf_output, "server_public_ip")
client_private_ip = tf_output_or_none(tf_output, "client_private_ip")
client_public_ip = tf_output_or_none(tf_output, "client_public_ip")
if (
server_private_ip is not None
or server_public_ip is not None
Expand Down Expand Up @@ -202,6 +202,13 @@ def setup_remote_environment(
)


def tf_output_or_none(tf_output, output_prop):
res = None
if output_prop in tf_output:
res = tf_output[output_prop]["value"][0]
return res


def extract_git_vars(path=None, github_url=None):
if path is None:
path = get_git_root(".")
Expand Down