]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #4896 from xinxinsh/wip-monitor-dump-transaction
authorJoao Eduardo Luis <jecluis@gmail.com>
Mon, 31 Aug 2015 09:17:58 +0000 (10:17 +0100)
committerJoao Eduardo Luis <jecluis@gmail.com>
Mon, 31 Aug 2015 09:17:58 +0000 (10:17 +0100)
MonitorDBStore : make monitor transaction more readable

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/common/config_opts.h
src/mon/MonitorDBStore.h

index 2bfbc581e962494c2be526ee4f6ed6210cff3ce7,a89b4411820f7d39d23dc43311bc34ff47746895..d3f89bcfb24d3f174a5e04168f6e3869dfaaccb6
@@@ -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]
Simple merge