From: Sage Weil Date: Sat, 20 Oct 2018 21:40:22 +0000 (-0500) Subject: Merge PR #24184 into master X-Git-Tag: v14.1.0~1136 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=98fc7ebc99a3639240eef4f745c9bd633446d2b3;p=ceph.git Merge PR #24184 into master * refs/pull/24184/head: mgr/DaemonServer: remove any upmaps on merging PGs mgr/DaemonServer: prevent merge if either pg is remapped|upmap mgr/DaemonServer: move pending merge check for more consistent code qa/suites/rados/thrash*/thrashers/careful.yaml: thrash with mgr controller mgr/DaemonServer: add option to bypass careful throttling for thrasher PendingReleaseNotes: note about mgr/balancer/max_misplaced change mgr/DaemonServer: remove stale/misleading check mgr/DaemonServer: throttle pgp_num changes based on misplaced % mgr/DaemonServer: block pg_num decrease(merge) until pgp_num is reduced mgr/DaemonServer: adjust_pgs(): cosmetic change to debug output mon/PGMap: add get_recovery_stats() mgr/balancer: mgr/balancer/max_misplaced -> pg_max_misplaced pybind/mgr/mgr_module: add get_option() mgr/DaemonServer: allow pg_num increases that abort pending merges mon/OSDMonitor: resent pre-nautilus client ops on aborted merge mon/OSDMonitor: make pgp_num track pg_num more consistently Reviewed-by: John Spray Reviewed-by: xie xingguo --- 98fc7ebc99a3639240eef4f745c9bd633446d2b3