]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #13610 from liewegas/wip-snapset
authorSage Weil <sage@newdream.net>
Fri, 12 May 2017 02:18:11 +0000 (21:18 -0500)
committerGitHub <noreply@github.com>
Fri, 12 May 2017 02:18:11 +0000 (21:18 -0500)
osd: eliminate snapdir objects and move clone snaps vector into SnapSet

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
qa/suites/rados/basic/tasks/readwrite.yaml
src/common/config_opts.h
src/mon/MonCommands.h
src/mon/OSDMonitor.cc
src/osd/ECBackend.cc
src/osd/PG.cc
src/osd/PrimaryLogPG.cc
src/osd/ReplicatedBackend.cc

index ae8ddca5fd69dfb0021f0e774492f4394280e0fa,56a74eec0df78f716c26a133809b31df25a27509..2b4fab679d8015fc80ab605802c1082af73b6298
@@@ -319,8 -320,8 +319,9 @@@ OPTION(mon_cache_target_full_warn_ratio
  OPTION(mon_osd_full_ratio, OPT_FLOAT, .95) // what % full makes an OSD "full"
  OPTION(mon_osd_backfillfull_ratio, OPT_FLOAT, .90) // what % full makes an OSD backfill full (backfill halted)
  OPTION(mon_osd_nearfull_ratio, OPT_FLOAT, .85) // what % full makes an OSD near full
 +OPTION(mon_osd_initial_require_min_compat_client, OPT_STR, "hammer")
  OPTION(mon_allow_pool_delete, OPT_BOOL, false) // allow pool deletion
+ OPTION(mon_fake_pool_delete, OPT_BOOL, false)  // fake pool deletion (add _DELETED suffix)
  OPTION(mon_globalid_prealloc, OPT_U32, 10000)   // how many globalids to prealloc
  OPTION(mon_osd_report_timeout, OPT_INT, 900)    // grace period before declaring unresponsive OSDs dead
  OPTION(mon_force_standby_active, OPT_BOOL, true) // should mons force standby-replay mds to be active
Simple merge
Simple merge
Simple merge
diff --cc src/osd/PG.cc
Simple merge
Simple merge
Simple merge