Merge branch 'next'

4 files changed, 15 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index aaf202293d1..3203f4271b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ceph (0.67-1) precise; urgency=low
+
+  * New upstream release 
+
+ -- Gary Lowell <gary.lowell@inktank.com>  Tue, 13 Aug 2013 10:44:30 -0700
+
 ceph (0.67-rc3-1) precise; urgency=low
 
   * New upstream release 
diff --git a/src/ceph-disk b/src/ceph-disk
index e34faaf0689..0ecfdf02073 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1345,6 +1345,7 @@ def move_mount(
     path,
     cluster,
     osd_id,
+    fstype,
     mount_options,
     ):
     LOG.debug('Moving mount to final location...')
@@ -1355,6 +1356,10 @@ def move_mount(
         )
     maybe_mkdir(osd_data)
 
+    # pick best-of-breed mount options based on fs type
+    if mount_options is None:
+        mount_options = MOUNT_OPTIONS.get(fstype, '')
+
     # we really want to mount --move, but that is not supported when
     # the parent mount is shared, as it is by default on RH, Fedora,
     # and probably others.  Also, --bind doesn't properly manipulate
@@ -1528,6 +1533,7 @@ def mount_activate(
                 path=path,
                 cluster=cluster,
                 osd_id=osd_id,
+                fstype=fstype,
                 mount_options=mount_options,
                 )
         return (cluster, osd_id)
diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index f67d0d1237d..d933250f282 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -426,8 +426,8 @@ OPTION(osd_default_data_pool_replay_window, OPT_INT, 45)
 OPTION(osd_preserve_trimmed_log, OPT_BOOL, false)
 OPTION(osd_auto_mark_unfound_lost, OPT_BOOL, false)
 OPTION(osd_recovery_delay_start, OPT_FLOAT, 0)
-OPTION(osd_recovery_max_active, OPT_INT, 60)
-OPTION(osd_recovery_max_single_start, OPT_INT, 10)
+OPTION(osd_recovery_max_active, OPT_INT, 15)
+OPTION(osd_recovery_max_single_start, OPT_INT, 5)
 OPTION(osd_recovery_max_chunk, OPT_U64, 8<<20)  // max size of push chunk
 OPTION(osd_push_per_object_cost, OPT_U64, 1000)  // push cost per object
 OPTION(osd_max_push_cost, OPT_U64, 8<<20)  // max size of push message
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index bbf363804bd..8690dd8fdbe 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -1709,7 +1709,7 @@ void RGWDeleteMultiObj_ObjStore_S3::send_partial_response(pair<string,int>& resu
       s->formatter->open_object_section("Deleted");
       s->formatter->dump_string("Key", result.first);
       s->formatter->close_section();
-    } else if (result.first < 0) {
+    } else if (result.second < 0) {
       struct rgw_http_errors r;
       int err_no;