From 863a1075cd29887e09b1c8f8870a8239b69a9a1c Mon Sep 17 00:00:00 2001 From: Andrey Berezin Date: Mon, 15 May 2023 14:23:40 +0300 Subject: [PATCH] Various fixes Signed-off-by: Andrey Berezin --- src/frostfs_testlib/load/load_report.py | 6 +++--- src/frostfs_testlib/processes/remote_process.py | 8 ++++++-- src/frostfs_testlib/storage/cluster.py | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/frostfs_testlib/load/load_report.py b/src/frostfs_testlib/load/load_report.py index 500a6e6..2771df5 100644 --- a/src/frostfs_testlib/load/load_report.py +++ b/src/frostfs_testlib/load/load_report.py @@ -141,13 +141,13 @@ class LoadReport: html = f""" - - + + {self._row("Total operations", total_operations)} {self._row("OP/sec", f"{total_rate:.2f}")} {throughput_html} - + {per_node_errors_html} {self._row("Total", f"{total_errors} ({total_errors/total_operations*100.0:.2f}%)")}
{short_summary}Metrics
{short_summary}
Metrics
Errors
Errors


diff --git a/src/frostfs_testlib/processes/remote_process.py b/src/frostfs_testlib/processes/remote_process.py index c5b40bc..7f49000 100644 --- a/src/frostfs_testlib/processes/remote_process.py +++ b/src/frostfs_testlib/processes/remote_process.py @@ -72,7 +72,9 @@ class RemoteProcess: if self.saved_stdout is not None: cur_stdout = self.saved_stdout 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: self.saved_stdout = terminal.stdout cur_stdout = terminal.stdout @@ -101,7 +103,9 @@ class RemoteProcess: if self.saved_stderr is not None: cur_stderr = self.saved_stderr 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: self.saved_stderr = terminal.stdout cur_stderr = terminal.stdout diff --git a/src/frostfs_testlib/storage/cluster.py b/src/frostfs_testlib/storage/cluster.py index db2ea37..ffca778 100644 --- a/src/frostfs_testlib/storage/cluster.py +++ b/src/frostfs_testlib/storage/cluster.py @@ -88,7 +88,7 @@ class ClusterNode: service_entry = self.class_registry.get_entry(service_type) 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) return service_type(