thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix slow op warning format

Browse Source
This commit is contained in:
Vitaliy Filippov
2024-12-11 21:09:36 +03:00
parent 76470686b3
commit 64db31ec10
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cmd/cli_status.cpp
+4 -2
View File
@@ -323,8 +323,9 @@ resume_2:
warning_str += " slow client ops: "; warning_str += " slow client ops: ";
for (int i = 0; i < slow_op_primary_osds.size(); i++) 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) if (slow_op_secondary_osds.size() > 0)
{ {
@@ -333,8 +334,9 @@ resume_2:
warning_str += " slow replication ops: "; warning_str += " slow replication ops: ";
for (int i = 0; i < slow_op_secondary_osds.size(); i++) 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 != "") if (warning_str != "")
{ {
src/osd/osd_cluster.cpp
-3
View File
@@ -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); 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()); 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 // One of PG state updates failed, put dirty flags back
for (auto pp: reporting_pgs) for (auto pp: reporting_pgs)
{ {