osd: Sessions get weak pointers to Connections

We were previously setting up a reference loop. But the only way
to get Sessions is via the Connection, so let's just give Sessions
the pointer, and give Connections a counted ref.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 954a1ce8673e4a67ef19887ee3e38872cb70006b..90397f428509e35d1629e2b295dbb0c5eb150392 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2575,7 +2575,7 @@ bool OSD::ms_verify_authorizer(Connection *con, int peer_type,
     if (!s) {
       s = new Session;
       con->set_priv(s->get());
-      s->con = con->get();
+      s->con = con;
       dout(10) << " new session " << s << " con=" << s->con << " addr=" << s->con->get_peer_addr() << dendl;
     }
 

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 29c78a6f2d4ca52063830d945b976add89742460..3b7491414440ec4bfaddb4908d090e890abbd7ba 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -229,7 +229,6 @@ public:
     std::map<void *, entity_name_t> notifs;
 
     Session() : last_sent_epoch(0), con(0) {}
-    ~Session() { if (con) con->put(); }
     void add_notif(void *n, entity_name_t& name) {
       notifs[n] = name;
     }