From 64db31ec107fcb827363149d56f2c0e61b52bf0b Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Wed, 11 Dec 2024 21:09:25 +0300 Subject: [PATCH] Fix slow op warning format --- src/cmd/cli_status.cpp | 6 ++++-- src/osd/osd_cluster.cpp | 3 --- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/cmd/cli_status.cpp b/src/cmd/cli_status.cpp index 55047ff9..65e3355b 100644 --- a/src/cmd/cli_status.cpp +++ b/src/cmd/cli_status.cpp @@ -323,8 +323,9 @@ resume_2: warning_str += " slow client ops: "; for (int i = 0; i < slow_op_primary_osds.size(); i++) { - warning_str += (i > 0 ? ", " : "")+std::to_string(slow_op_primary_osds[i])+"\n"; + warning_str += (i > 0 ? ", " : "")+std::to_string(slow_op_primary_osds[i]); } + warning_str += "\n"; } if (slow_op_secondary_osds.size() > 0) { @@ -333,8 +334,9 @@ resume_2: warning_str += " slow replication ops: "; for (int i = 0; i < slow_op_secondary_osds.size(); i++) { - warning_str += (i > 0 ? ", " : "")+std::to_string(slow_op_secondary_osds[i])+"\n"; + warning_str += (i > 0 ? ", " : "")+std::to_string(slow_op_secondary_osds[i]); } + warning_str += "\n"; } if (warning_str != "") { diff --git a/src/osd/osd_cluster.cpp b/src/osd/osd_cluster.cpp index e8dac2c8..84c6e235 100644 --- a/src/osd/osd_cluster.cpp +++ b/src/osd/osd_cluster.cpp @@ -1024,9 +1024,6 @@ void osd_t::report_pg_states() rpgnames += (rpgnames.size() ? ", " : "")+std::to_string(pp.pool_pg_num.pool_id)+"/"+std::to_string(pp.pool_pg_num.pg_num); } printf("Error reporting PG %s states, will repeat the attempt: %s\n", rpgnames.c_str(), err.c_str()); - } - if (!data["succeeded"].bool_value()) - { // One of PG state updates failed, put dirty flags back for (auto pp: reporting_pgs) {