From: Samuel Just <sam.just@inktank.com>
Date: Tue, 11 Dec 2012 06:00:30 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/wip_split2' into next
X-Git-Tag: v0.56~83
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bcf1461c7e3dad87985b8ccbb2418bfdf6831da5;p=ceph.git

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

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

bcf1461c7e3dad87985b8ccbb2418bfdf6831da5
diff --cc src/common/config_opts.h
index d312ef28e0c8,3ae5870b3662..b04a28f3259a
--- a/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)