Merge pull request #18276 from liewegas/wip-removed-snaps

mon,osd,osdc: refactor snap trimming (phase 1)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

diff --cc qa/suites/rados/singleton/all/thrash-eio.yaml
index 5efc4154421bb69422791e7d6bb6564c319792ac,cea537b1c0337481eeab0b4656b50b83b62bc349..9e523845f45f984497cc1dca0b428fe2c63230a1
--- 1/qa/suites/rados/singleton/all/thrash-eio.yaml
--- 2/qa/suites/rados/singleton/all/thrash-eio.yaml
+++ b/qa/suites/rados/singleton/all/thrash-eio.yaml
@@@ -29,8 -29,8 +29,9 @@@ tasks
      - \(REQUEST_SLOW\)
      - \(SLOW_OPS\)
      - \(PG_
 +    - \(OBJECT_MISPLACED\)
      - \(OSD_
+     - \(OBJECT_
  - thrashosds:
      op_delay: 30
      clean_interval: 120

diff --cc src/common/options.cc
Simple merge

diff --cc src/include/interval_set.h
Simple merge

diff --cc src/include/rados.h
Simple merge

diff --cc src/mds/SnapServer.cc
Simple merge

diff --cc src/osd/PG.h
Simple merge

diff --cc src/osd/PrimaryLogPG.cc
Simple merge

diff --cc src/osd/PrimaryLogPG.h
Simple merge

diff --cc src/osd/osd_types.cc
Simple merge

diff --cc src/osd/osd_types.h
Simple merge

diff --cc src/osdc/Objecter.cc
Simple merge

diff --cc src/osdc/Objecter.h
Simple merge