]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
PrimaryLogPG: reimplement osd_snap_trim_sleep within the state machine
authorGreg Farnum <gfarnum@redhat.com>
Wed, 12 Apr 2017 23:30:55 +0000 (16:30 -0700)
committerGreg Farnum <gfarnum@redhat.com>
Mon, 17 Apr 2017 14:16:34 +0000 (07:16 -0700)
commit360a9d9af003c650cdf00534909d6488c702c413
tree7c5826d1390077f67e5be79ad2f96a970e42503b
parent18dbf6a0245e35dbbdb5ddb760182795b37983c0
PrimaryLogPG: reimplement osd_snap_trim_sleep within the state machine

Rather than blocking the main op queue, just pause for that amount of
time between state machine cycles.

Also, add osd_snap_trim_sleep to a few of the thrasher yamls.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 2ed7759cfeb03e71f0fbd98fe7c2db2bb741861c)

Conflicts:
src/osd/PrimaryLogPG.cc

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 67336454a4cee66522bc0ca01b2c58b8960f75ec)

Conflicts:
qa/suites/rados/thrash/thrashers/default.yaml
qa/suites/rados/thrash/thrashers/pggrow.yaml
src/osd/OSD.h
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
qa/suites/rados/thrash/thrashers/default.yaml
qa/suites/rados/thrash/thrashers/pggrow.yaml
src/common/config_opts.h
src/osd/OSD.cc
src/osd/OSD.h
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h