RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 11:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon/Session: only index osd ids >= 0

Browse Source 
This ensures that get_random_osd_session behaves when it does

    int n = by_osd.rbegin()->first + 1;
    int r = rand() % n;

Fixes: https://tracker.ceph.com/issues/43552
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2020-01-21 15:09:01 -06:00
parent 057391854c
commit d6f0642b82
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mon/Session.h
View File

@ -139,7 +139,8 @@ struct MonSessionMap {
}
s->sub_map.clear();
s->item.remove_myself();
if (s->name.is_osd()) {
if (s->name.is_osd() &&
s->name.num() >= 0) {
for (auto p = by_osd.find(s->name.num());
p->first == s->name.num();
++p)
@ -168,7 +169,8 @@ struct MonSessionMap {
void add_session(MonSession *s) {
sessions.push_back(&s->item);
s->get();
if (s->name.is_osd()) {
if (s->name.is_osd() &&
s->name.num() >= 0) {
by_osd.insert(std::pair<int,MonSession*>(s->name.num(), s));
}
if (s->con_features) {