]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
osd/PrimaryLogPG: Avoid accessing destroyed references in finish_degraded_object
authorTao Ning <ningtao@sangfor.com.cn>
Wed, 14 Aug 2019 13:07:46 +0000 (21:07 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 15 Aug 2019 02:15:15 +0000 (10:15 +0800)
commit86d55c1a0ddb48efc0c1934728d27f22cf49dfa1
tree20ab9cdab6d6c8d1b1a78ea8bdc660c8c9c47fa9
parent2b5f62852b86ab89f19d0f35414601889dfb0269
osd/PrimaryLogPG: Avoid accessing destroyed references in finish_degraded_object

As follows:
for (auto i = callbacks_for_degraded_object.begin(); i != callbacks_for_degraded_object.end();) {
    finish_degraded_object((i++)->first);
}

void PrimaryLogPG::finish_degraded_object(const hobject_t oid)
{
  if (callbacks_for_degraded_object.count(oid)) {
    contexts.swap(callbacks_for_degraded_object[oid]);
    callbacks_for_degraded_object.erase(oid);   // Release
  }

  map<hobject_t, snapid_t>::iterator i = objects_blocked_on_degraded_snap.find(
    oid.get_head());  // Access
  ...
}

Fixes: https://tracker.ceph.com/issues/41250
Signed-off-by: Tao Ning <ningtao@sangfor.com.cn>
src/osd/PrimaryLogPG.cc
src/osd/PrimaryLogPG.h