RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-21 02:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

ReplicatedPG: watchers must grab Connection ref as well

Browse Source 
Session refs are not really valid on their own, the
corresponding Connection must remain live for at least
as long as the Session.

Signed-off-by: Samuel Just <sam.just@inktank.com>
This commit is contained in:
Samuel Just 2012-12-12 14:06:51 -08:00
parent 64cefe2c60
commit fdf66b6a8d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/osd/ReplicatedPG.cc
View File

@ -1586,6 +1586,7 @@ void ReplicatedPG::remove_watcher(ObjectContext *obc, entity_name_t entity)
session->watches.erase(obc);
put_object_context(obc);
session->con->put();
session->put();
}
@ -3345,6 +3346,7 @@ void ReplicatedPG::do_osd_op_effects(OpContext *ctx)
if (iter == obc->watchers.end()) {
dout(10) << " connected to " << w << " by " << entity << " session " << session << dendl;
obc->watchers[entity] = session;
session->con->get();
session->get();
session->watches[obc] = get_osdmap()->object_locator_to_pg(soid.oid, obc->obs.oi.oloc);
obc->ref++;
@ -3356,10 +3358,14 @@ void ReplicatedPG::do_osd_op_effects(OpContext *ctx)
// weird: same entity, different session.
dout(10) << " reconnected (with different session!) watch " << w << " by " << entity
<< " session " << session << " (was " << iter->second << ")" << dendl;
iter->second->watches.erase(obc);
iter->second->put();
iter->second = session;
session->con->get();
session->get();
iter->second->watches.erase(obc);
iter->second->con->put();
iter->second->put();
iter->second = session;
session->watches[obc] = get_osdmap()->object_locator_to_pg(soid.oid, obc->obs.oi.oloc);
}
map<entity_name_t,Watch::C_WatchTimeout*>::iterator un_iter =