Skip to content

Commit d12b336

Browse files
authored
Merge pull request ceph#58592 from NitzanMordhai/wip-nitzan-crimson-mgr-client-lost-connection
mgr/client: validate connection before sending Reviewed-by: Matan Breizman <[email protected]> Reviewed-by: Radosław Zarzyński <[email protected]> Reviewed-by: Yingxin Cheng <[email protected]>
2 parents f1dbbcb + 08347be commit d12b336

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

qa/config/crimson_qa_overrides.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ overrides:
99
osd pool default crimson: true
1010
osd:
1111
crimson osd obc lru size: 10
12-
mgr:
13-
mgr stats period: 30
1412
flavor: crimson
1513
workunit:
1614
env:

src/crimson/mgr/client.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ void Client::report()
165165
}
166166
return with_stats.get_stats(
167167
).then([this](auto &&pg_stats) {
168+
if (!conn) {
169+
logger().warn("report: no conn available; before sending stats, report skipped");
170+
return seastar::now();
171+
}
168172
return conn->send(std::move(pg_stats));
169173
});
170174
});

0 commit comments

Comments
 (0)