git-server-git.apps.pok.os.sepia.ceph.com Git

author	Samuel Just <sam.just@inktank.com>
	Mon, 16 Jul 2012 20:07:56 +0000 (13:07 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Mon, 16 Jul 2012 21:18:22 +0000 (14:18 -0700)
commit	4afa89259156936207fd523b57b5a838bed36fee
tree	51af22d959ffdc5616705c0778621d4dff676dfd	tree \| snapshot
parent	5f60236610c6260a218476f9a1f3763e27ec0ef7	commit \| diff

PG: use stats from primary after rewinding divergent entries

If the osd recieving the info has divergent entries, it will
also have a "divergent" stat structure.

Probably fixes #2769.

In cases like #2769, this bug can result in a primary with a stat
structure which double counts an operation: once for the
divergent operation, and once for the replay.

This is another way for the bug addressed in
5924f8e4a8c29e6de326a9e8576c30109cdc0e07 to happen.

Signed-off-by: Samuel Just <sam.just@inktank.com>