From: Joao Eduardo Luis Date: Mon, 31 Aug 2015 09:17:58 +0000 (+0100) Subject: Merge pull request #4896 from xinxinsh/wip-monitor-dump-transaction X-Git-Tag: v9.1.0~260 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=35c80951cadec84efe9e05eabc690a73efdad4fe;p=ceph.git Merge pull request #4896 from xinxinsh/wip-monitor-dump-transaction MonitorDBStore : make monitor transaction more readable Reviewed-by: Joao Eduardo Luis Reviewed-by: Sage Weil --- 35c80951cadec84efe9e05eabc690a73efdad4fe diff --cc src/common/config_opts.h index 2bfbc581e962,a89b4411820f..d3f89bcfb24d --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@@ -276,11 -256,9 +276,12 @@@ OPTION(mon_osd_min_down_reports, OPT_IN OPTION(mon_osd_force_trim_to, OPT_INT, 0) // force mon to trim maps to this point, regardless of min_last_epoch_clean (dangerous, use with care) OPTION(mon_mds_force_trim_to, OPT_INT, 0) // force mon to trim mdsmaps to this point (dangerous, use with care) +// monitor debug options +OPTION(mon_debug_deprecated_as_obsolete, OPT_BOOL, false) // consider deprecated commands as obsolete + // dump transactions OPTION(mon_debug_dump_transactions, OPT_BOOL, false) + OPTION(mon_debug_dump_json, OPT_BOOL, false) OPTION(mon_debug_dump_location, OPT_STR, "/var/log/ceph/$cluster-$name.tdump") OPTION(mon_inject_transaction_delay_max, OPT_DOUBLE, 10.0) // seconds OPTION(mon_inject_transaction_delay_probability, OPT_DOUBLE, 0) // range [0, 1]