From 7fa4c06123536f0688b0907bbea60e430c025942 Mon Sep 17 00:00:00 2001 From: Janusz Marcinkiewicz Date: Wed, 29 Jan 2025 10:09:25 -0500 Subject: [PATCH] throughput metric: remove residual "mbps"; fix python lint Signed-off-by: Alex Aizman --- .../aisloader-composer/consolidate_results.py | 2 +- python/pyaisloader/pyaisloader/benchmark.py | 2 +- .../pyaisloader/utils/cli_utils.py | 2 +- .../pyaisloader/utils/print_utils.py | 2 +- stats/common_prom.go | 2 +- stats/common_statsd.go | 19 +++---------------- stats/target_stats.go | 4 ++-- 7 files changed, 10 insertions(+), 23 deletions(-) diff --git a/bench/tools/aisloader-composer/consolidate_results.py b/bench/tools/aisloader-composer/consolidate_results.py index 38d6c9fdf4d..cc0bdccc88e 100644 --- a/bench/tools/aisloader-composer/consolidate_results.py +++ b/bench/tools/aisloader-composer/consolidate_results.py @@ -1,5 +1,5 @@ """ -Python script designed to analyze and amalgamate the data from +Python script designed to analyze and amalgamate the data from AIS Loader-generated files into a cohesive report Copyright (c) 2023, NVIDIA CORPORATION. All rights reserved. diff --git a/python/pyaisloader/pyaisloader/benchmark.py b/python/pyaisloader/pyaisloader/benchmark.py index 6b9cf791a1a..94cfb9bc365 100644 --- a/python/pyaisloader/pyaisloader/benchmark.py +++ b/python/pyaisloader/pyaisloader/benchmark.py @@ -136,7 +136,7 @@ def __prepopulate_h(self, objs_created, prefix, suffix): def clean_up(self, new=True): if new: - print_in_progress("Cleaning up", "\U0001F9F9") + print_in_progress("Cleaning up", "\U0001f9f9") if not self.bck_created and not self.objs_created: print_caution("Nothing to delete! Skipping clean-up...") diff --git a/python/pyaisloader/pyaisloader/utils/cli_utils.py b/python/pyaisloader/pyaisloader/utils/cli_utils.py index 6c4e277fff0..64959a2eee4 100644 --- a/python/pyaisloader/pyaisloader/utils/cli_utils.py +++ b/python/pyaisloader/pyaisloader/utils/cli_utils.py @@ -20,7 +20,7 @@ def print_sep(): print("\n" + "=" * 101 + "\n") -def print_in_progress(msg, icon="\U0001F552"): +def print_in_progress(msg, icon="\U0001f552"): print( "\n" + Back.LIGHTBLACK_EX diff --git a/python/pyaisloader/pyaisloader/utils/print_utils.py b/python/pyaisloader/pyaisloader/utils/print_utils.py index 0ae38772c93..cf1f22d8cae 100644 --- a/python/pyaisloader/pyaisloader/utils/print_utils.py +++ b/python/pyaisloader/pyaisloader/utils/print_utils.py @@ -26,7 +26,7 @@ def confirm_continue(): confirm_continue() -def print_in_progress(msg, icon="\U0001F552"): +def print_in_progress(msg, icon="\U0001f552"): print( "\n" + Back.LIGHTBLACK_EX diff --git a/stats/common_prom.go b/stats/common_prom.go index 83de8103889..7c7172fcca0 100644 --- a/stats/common_prom.go +++ b/stats/common_prom.go @@ -198,7 +198,7 @@ func (r *runner) reg(snode *meta.Snode, name, kind string, extra *Extra) { metricName = strings.TrimSuffix(name, ".ns") + "_ms" case KindThroughput, KindComputedThroughput: debug.Assert(strings.HasSuffix(name, ".bps"), name) - metricName = strings.TrimSuffix(name, ".bps") + "_mbps" + metricName = strings.TrimSuffix(name, ".bps") + "_bps" default: metricName = name } diff --git a/stats/common_statsd.go b/stats/common_statsd.go index 94a1431d59f..f01740c987c 100644 --- a/stats/common_statsd.go +++ b/stats/common_statsd.go @@ -150,15 +150,13 @@ func (s *coreStats) copyT(out copyTracker, diskLowUtil ...int64) bool { } out[name] = copyValue{throughput} if !s.statsdDisabled() && throughput > 0 { - fv := roundMBs(throughput) - s.statsdC.AppMetric(metric{Type: statsd.Gauge, Name: v.label.stpr, Value: fv}, s.sgl) + s.statsdC.AppMetric(metric{Type: statsd.Gauge, Name: v.label.stpr, Value: throughput}, s.sgl) } case KindComputedThroughput: if throughput := ratomic.SwapInt64(&v.Value, 0); throughput > 0 { out[name] = copyValue{throughput} if !s.statsdDisabled() { - fv := roundMBs(throughput) - s.statsdC.AppMetric(metric{Type: statsd.Gauge, Name: v.label.stpr, Value: fv}, s.sgl) + s.statsdC.AppMetric(metric{Type: statsd.Gauge, Name: v.label.stpr, Value: throughput}, s.sgl) } } case KindCounter, KindSize, KindTotal: @@ -292,7 +290,7 @@ func (r *runner) reg(snode *meta.Snode, name, kind string, _ *Extra) { case KindThroughput, KindComputedThroughput: debug.Assert(strings.HasSuffix(name, ".bps"), name) v.label.comm = strings.TrimSuffix(name, ".bps") - v.label.stpr = f("mbps") + v.label.stpr = f("bps") default: debug.Assert(kind == KindGauge || kind == KindSpecial) v.label.comm = name @@ -310,14 +308,3 @@ func (r *runner) reg(snode *meta.Snode, name, kind string, _ *Extra) { func (*runner) PromHandler() http.Handler { return nil } func (r *runner) closeStatsD() { r.core.statsdC.Close() } - -// convert bytes to meGabytes with a fixed rounding precision = 2 digits -// - KindThroughput and KindComputedThroughput only -// - MB, not MiB -// - math.Ceil wouldn't produce two decimals -func roundMBs(val int64) (mbs float64) { - mbs = float64(val) / 1000 / 10 - num := int(mbs + 0.5) - mbs = float64(num) / 100 - return -} diff --git a/stats/target_stats.go b/stats/target_stats.go index 216c2ef912c..4ae93697d9e 100644 --- a/stats/target_stats.go +++ b/stats/target_stats.go @@ -489,13 +489,13 @@ func (r *Trunner) RegDiskMetrics(snode *meta.Snode, disk string) { // "disk.. (e.g.: "disk.nvme0n1.read.bps") r.reg(snode, name, KindComputedThroughput, - &Extra{Help: "read bandwidth (MB/s)", StrName: "disk_read_mbps", Labels: cos.StrKVs{"disk": disk}}, + &Extra{Help: "read bandwidth (B/s)", StrName: "disk_read_bps", Labels: cos.StrKVs{"disk": disk}}, ) r.reg(snode, r.nameRavg(disk), KindGauge, &Extra{Help: "average read size (bytes)", StrName: "disk_avg_rsize", Labels: cos.StrKVs{"disk": disk}}, ) r.reg(snode, r.nameWbps(disk), KindComputedThroughput, - &Extra{Help: "write bandwidth (MB/s)", StrName: "disk_write_mbps", Labels: cos.StrKVs{"disk": disk}}, + &Extra{Help: "write bandwidth (B/s)", StrName: "disk_write_bps", Labels: cos.StrKVs{"disk": disk}}, ) r.reg(snode, r.nameWavg(disk), KindGauge, &Extra{Help: "average write size (bytes)", StrName: "disk_avg_wsize", Labels: cos.StrKVs{"disk": disk}},