]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
osd/PGLog.h: update missing set verification for deletes
authorJosh Durgin <jdurgin@redhat.com>
Fri, 23 Jun 2017 22:39:00 +0000 (18:39 -0400)
committerJosh Durgin <jdurgin@redhat.com>
Mon, 17 Jul 2017 06:00:36 +0000 (02:00 -0400)
commit31d6a030e540c533d151020dcbdd7e35c964ccad
treeb96a2e9ec7ec16daa85b93a28633ef1171c302cf
parentfff55a483476b82739651ad79a4339a833506017
osd/PGLog.h: update missing set verification for deletes

Deleted objects may still be on-disk after merging a log that includes
deletes, so adjust the asserts accordingly.

A case like:

980'1192 (972'1186) modify foo
--- osd restart ---
999'1196 (980'1192) delete foo
1003'1199 (0'0) modify foo
1015'1208 (1003'1199) delete foo

Would trigger the assert(miter->second.have == oi.info) since the
'have' version would would be reset to 0'0.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
src/osd/PGLog.h