Merge pull request ceph#32908 from smithfarm/wip-43821-nautilus

nautilus: mon/Session: only index osd ids >= 0
kunpengcompute · Feb 13, 2020 · 7a46e53 · 7a46e53
2 parents 11256ac + 5b9a2b7
commit 7a46e53
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/mon/Session.h b/src/mon/Session.h
@@ -134,7 +134,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 (multimap<int,MonSession*>::iterator p = by_osd.find(s->name.num());
 	   p->first == s->name.num();
 	   ++p)
@@ -163,7 +164,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(pair<int,MonSession*>(s->name.num(), s));
     }
     if (s->con_features) {