]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
FileStore: fix initialization order for m_disable_wbthrottle 8067/head
authorSamuel Just <sjust@redhat.com>
Fri, 11 Mar 2016 23:16:37 +0000 (15:16 -0800)
committerSamuel Just <sjust@redhat.com>
Fri, 11 Mar 2016 23:16:37 +0000 (15:16 -0800)
Signed-off-by: Samuel Just <sjust@redhat.com>
src/os/filestore/FileStore.cc

index 35589a34328867d030482130d1954f60cc731d77..6cd4134ce94aca9ae18bff019b213dd411ca7822 100644 (file)
@@ -526,10 +526,10 @@ FileStore::FileStore(const std::string &base, const std::string &jdev, osflagbit
   fdcache(g_ceph_context),
   wbthrottle(g_ceph_context),
   next_osr_id(0),
-  throttle_ops(g_conf->filestore_caller_concurrency),
-  throttle_bytes(g_conf->filestore_caller_concurrency),
   m_disable_wbthrottle(g_conf->filestore_odsync_write || 
                       !g_conf->filestore_wbthrottle_enable),
+  throttle_ops(g_conf->filestore_caller_concurrency),
+  throttle_bytes(g_conf->filestore_caller_concurrency),
   m_ondisk_finisher_num(g_conf->filestore_ondisk_finisher_threads),
   m_apply_finisher_num(g_conf->filestore_apply_finisher_threads),
   op_tp(g_ceph_context, "FileStore::op_tp", "tp_fstore_op", g_conf->filestore_op_threads, "filestore_op_threads"),