Merge remote-tracking branch 'upstream/wip_split2' into next

Reviewed-by: Greg Farnum <greg@inktank.com>

diff --cc src/common/config_opts.h
index d312ef28e0c8507de963c47acab7937376303b09,3ae5870b36629d60921ed3ca7710eb2308310072..b04a28f3259afae6b583ba0f855de058d1a8da5b
--- 1/src/common/config_opts.h
--- 2/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@@ -374,9 -373,13 +374,13 @@@ OPTION(osd_target_transaction_size, OPT
   * 1..63.
   */
  OPTION(osd_client_op_priority, OPT_INT, 63)
 -OPTION(osd_recovery_op_priority, OPT_INT, 30)
 +OPTION(osd_recovery_op_priority, OPT_INT, 10)
  
  OPTION(filestore, OPT_BOOL, false)
+ 
+ // Tests index failure paths
+ OPTION(filestore_index_retry_probability, OPT_DOUBLE, 0)
+ 
  OPTION(filestore_debug_omap_check, OPT_BOOL, 0) // Expensive debugging check on sync
  // Use omap for xattrs for attrs over
  OPTION(filestore_xattr_use_omap, OPT_BOOL, false)

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

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

diff --cc src/os/FileStore.cc
Simple merge

diff --cc src/os/HashIndex.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/osd_types.cc
Simple merge

diff --cc src/osd/osd_types.h
Simple merge

diff --cc src/test/filestore/store_test.cc
Simple merge