]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd: fix _activate_committed replica->primary message
authorSage Weil <sage@newdream.net>
Wed, 15 Feb 2012 21:16:25 +0000 (13:16 -0800)
committerSamuel Just <samuel.just@dreamhost.com>
Thu, 16 Feb 2012 17:12:45 +0000 (09:12 -0800)
commit4b3bb5ab37a05fa001d59f24da7d9c30d650321b
tree440d121a8c89885d85632ca15f294265f76a6add
parent82eceb9a3bd978bb96df5803b6dc7935b88a56ee
osd: fix _activate_committed replica->primary message

Normally we take a fresh map reference in PG::lock().  However,
_activate_committed needs to make sure the map hasn't changed significantly
before acting.  In the case of #2068, the OSD map has moved forward and
the mapping has changed, but the PG hasn't processed that yet, and thus
mis-tags the MOSDPGInfo message.

Tag the message with the e epoch, and also pass down the primary's address
to send the message to the right location.

Fixes: #2068
Signed-off-by: Sage Weil <sage@newdream.net>
src/osd/PG.cc
src/osd/PG.h