From: Sage Weil Date: Wed, 18 Mar 2020 17:12:54 +0000 (-0500) Subject: Merge PR #34011 into octopus X-Git-Tag: v15.2.0~23 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11d607d0b7e684b1fbf44022c7c039f40aae1160;p=ceph.git Merge PR #34011 into octopus * refs/pull/34011/head: qa/suites/rados/verify/validater/valgrind: tolerate SLOW_OPS qa/suites/rados/verify/validater/valgrind: less bluestore logging qa/suites/rados/verify/validater: increase heartbeat grace Revert "qa/suites/rados/verify: debug_ms = 1, osd_heartbeat_grace = 60" Revert "qa/suites/rados/verify/validator/valgrind: debug refs = 5" ceph_test_watch_notify: try notify 10x if ALLOW_TIMEOUTS is set ceph_test_rados_api_misc: ShutdownRace timeout if ALLOW_TIMEOUTS is set qa/suites/rados/verify: set ALLOW_TIMEOUTS for workunits Reviewed-by: Brad Hubbard Reviewed-by: Neha Ojha --- 11d607d0b7e684b1fbf44022c7c039f40aae1160