Skip to content
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.

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

Bump redis dep to 7.2.4 #470

Merged
merged 2 commits into from
Feb 28, 2024
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ htmlcov
.idea
*.iml
*.komodoproject
.vscode

# Complexity
output/*.html
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RPP_VER := 1.3.10
PYBIND_URL := https://github.com/pybind/pybind11.git
PYBIND_VER := v2.11.1
REDIS_URL := https://github.com/redis/redis.git
REDIS_VER := 7.0.5
REDIS_VER := 7.2.4
REDISAI_URL := https://github.com/RedisAI/RedisAI.git
# REDISAI_VER is controlled instead by SR_TEST_REDISAI_VER below
CATCH2_URL := https://github.com/catchorg/Catch2.git
Expand Down
7 changes: 5 additions & 2 deletions utils/launch_redis.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ def check_availability(n_nodes, port, udsport):
sleep(5)
if not command_succeeded:
raise RuntimeError(f"Failed to validate availability for connection {connection}")
# add a small sleep after completing availability test to let cluster complete setup
sleep(1)

def stop_db(n_nodes, port, udsport):
"""Stop a redis cluster and clear the files
Expand Down Expand Up @@ -205,10 +207,11 @@ def create_db(n_nodes, port, device, rai_ver, udsport):
# Create cluster for clustered Redis request
if n_nodes > 1:
cluster_str = " ".join(f"127.0.0.1:{port + i}" for i in range(n_nodes))
cmd = f"{rediscli} --cluster create {cluster_str} --cluster-replicas 0"
cmd = f"{rediscli} --cluster create {cluster_str} --cluster-replicas 0 --cluster-yes"
print(cmd)
proc = run(cmd.split(), input="yes", encoding="utf-8", shell=False)
proc = run(cmd.split(), encoding="utf-8", shell=False)
if proc.returncode != 0:
print(f'{rediscli} returncode: {proc.returncode}')
raise SubprocessError("Cluster could not be created!")
sleep(2)
print("Cluster has been setup!")
Expand Down
Loading