]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd/PrimaryLogPG: fix potential pg-log overtrimming 24309/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Mon, 30 Jul 2018 10:56:56 +0000 (18:56 +0800)
committerNeha Ojha <nojha@redhat.com>
Thu, 27 Sep 2018 16:47:02 +0000 (16:47 +0000)
commit623892f6eb3444ef0cc24ad6140a9179846872a9
treed743e8d7347d238709f940857196b4e45767ba20
parentdd80d9cabd718d2423298c8e3d9bbc222b314269
osd/PrimaryLogPG: fix potential pg-log overtrimming

In https://github.com/ceph/ceph/pull/21580 I set a trap to catch some wired
and random segmentfaults and in a recent QA run I was able to observe it was
successfully triggered by one of the test case, see:

```
http://qa-proxy.ceph.com/teuthology/xxg-2018-07-30_05:25:06-rados-wip-hb-peers-distro-basic-smithi/2837916/teuthology.log
```

The root cause is that there might be holes on log versions, thus the
approx_size() method should (almost) always overestimate the actual number of log entries.
As a result, we might be at the risk of overtrimming log entries.

https://github.com/ceph/ceph/pull/18338 reveals a probably easier way
to fix the above problem but unfortunately it also can cause big performance regression
and hence comes this pr..

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 3654d56985c67d15506fa37b56ef5b0c04e01a65)

Conflicts:
src/osd/PrimaryLogPG.cc: trivial resolution
src/osd/PrimaryLogPG.cc