TrueCloudLab/frostfs-testlib
25
0
Fork 20
Code Issues Pull requests 2 Releases 1 Activity Actions

Various fixes #18

Merged
abereziny merged 1 commit from abereziny/frostfs-testlib:fix-service-resolution into master 2023-05-15 12:42:59 +00:00
Conversation 0 Commits 1 Files changed 3 +10 -6
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/frostfs_testlib/load/load_report.py
View file

@ -141,13 +141,13 @@ class LoadReport:
html = f""" html = f"""
<table border="1" cellpadding="5px"><tbody> <table border="1" cellpadding="5px"><tbody>
<th colspan="2" bgcolor="gainsboro">{short_summary}</th> <tr><th colspan="2" bgcolor="gainsboro">{short_summary}</th></tr>
<th colspan="2" bgcolor="gainsboro">Metrics</th> <tr><th colspan="2" bgcolor="gainsboro">Metrics</th></tr>
{self._row("Total operations", total_operations)} {self._row("Total operations", total_operations)}
{self._row("OP/sec", f"{total_rate:.2f}")} {self._row("OP/sec", f"{total_rate:.2f}")}
{throughput_html} {throughput_html}
<th colspan="2" bgcolor="gainsboro">Errors</th> <tr><th colspan="2" bgcolor="gainsboro">Errors</th></tr>
{per_node_errors_html} {per_node_errors_html}
{self._row("Total", f"{total_errors} ({total_errors/total_operations*100.0:.2f}%)")} {self._row("Total", f"{total_errors} ({total_errors/total_operations*100.0:.2f}%)")}
</tbody></table><br><hr> </tbody></table><br><hr>

8
src/frostfs_testlib/processes/remote_process.py
View file

@ -72,7 +72,9 @@ class RemoteProcess:
if self.saved_stdout is not None: if self.saved_stdout is not None:
cur_stdout = self.saved_stdout cur_stdout = self.saved_stdout
else: else:
terminal = self.shell.exec(f"cat {self.process_dir}/stdout") terminal = self.shell.exec(
f"cat {self.process_dir}/stdout", options=CommandOptions(no_log=True)
)
if self.proc_rc is not None: if self.proc_rc is not None:
self.saved_stdout = terminal.stdout self.saved_stdout = terminal.stdout
cur_stdout = terminal.stdout cur_stdout = terminal.stdout
@ -101,7 +103,9 @@ class RemoteProcess:
if self.saved_stderr is not None: if self.saved_stderr is not None:
cur_stderr = self.saved_stderr cur_stderr = self.saved_stderr
else: else:
terminal = self.shell.exec(f"cat {self.process_dir}/stderr") terminal = self.shell.exec(
f"cat {self.process_dir}/stderr", options=CommandOptions(no_log=True)
)
if self.proc_rc is not None: if self.proc_rc is not None:
self.saved_stderr = terminal.stdout self.saved_stderr = terminal.stdout
cur_stderr = terminal.stdout cur_stderr = terminal.stdout

2
src/frostfs_testlib/storage/cluster.py
View file

@ -88,7 +88,7 @@ class ClusterNode:
service_entry = self.class_registry.get_entry(service_type) service_entry = self.class_registry.get_entry(service_type)
service_name = service_entry["hosting_service_name"] service_name = service_entry["hosting_service_name"]
pattern = f"{service_name}{self.id}" pattern = f"{service_name}{self.id:02}"
config = self.host.get_service_config(pattern) config = self.host.get_service_config(pattern)
return service_type( return service_type(