Merge pull request #400 from ceph/wip-mon-newsync

simpler mon sync

Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>

diff --cc src/common/config_opts.h
index 2e386f9d7325bf90aa0e1f8a4f5a0d37644a775f,5f355db542e4b3600d5a6762ce956383a58fcec9..01ec8375cd2904b0cc35e92968e8f4636f661b5b
--- 1/src/common/config_opts.h
--- 2/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@@ -182,9 -177,9 +177,10 @@@ OPTION(mon_sync_debug, OPT_BOOL, false
  OPTION(mon_sync_debug_leader, OPT_INT, -1) // monitor to be used as the sync leader
  OPTION(mon_sync_debug_provider, OPT_INT, -1) // monitor to be used as the sync provider
  OPTION(mon_sync_debug_provider_fallback, OPT_INT, -1) // monitor to be used as fallback if sync provider fails
+ OPTION(mon_inject_sync_get_chunk_delay, OPT_DOUBLE, 0)  // inject N second delay on each get_chunk request
  OPTION(mon_osd_min_down_reporters, OPT_INT, 1)   // number of OSDs who need to report a down OSD for it to count
  OPTION(mon_osd_min_down_reports, OPT_INT, 3)     // number of times a down OSD must be reported for it to count
 +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)
  
  // dump transactions
  OPTION(mon_debug_dump_transactions, OPT_BOOL, false)

diff --cc src/mon/Monitor.cc
Simple merge

diff --cc src/mon/PGMonitor.cc
Simple merge

diff --cc src/mon/PGMonitor.h
Simple merge

diff --cc src/mon/PaxosService.h
Simple merge