Skip to content

Commit cac01a7

Browse files
Aradhya-Tripathimergify[bot]
authored andcommitted
refactor(bench): Check for exited benches as well in container exists & force remove bench on archive
(cherry picked from commit 2511ad6)
1 parent f4a2e59 commit cac01a7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

agent/bench.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -858,8 +858,8 @@ def start(self, secondary_server_private_ip: str | None = None):
858858

859859
def stop(self):
860860
if self.bench_config.get("single_container"):
861-
self.execute(f"docker stop {self.name}")
862-
return self.execute(f"docker rm {self.name}")
861+
return self.execute(f"docker rm {self.name} --force")
862+
863863
return self.execute(f"docker stack rm {self.name}")
864864

865865
@step("Stop Bench")

agent/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def container_exists(self, name: str, max_retries: int = 3):
140140
"""
141141
for attempt in range(max_retries):
142142
try:
143-
self.execute(f"""docker ps --filter "name=^{name}$" | grep {name}""")
143+
self.execute(f"""docker ps --all --filter "name=^{name}$" | grep {name}""")
144144
except AgentException:
145145
break # container does not exist
146146
else:

0 commit comments

Comments
 (0)