From: Ning Yao Date: Wed, 10 Dec 2014 04:50:44 +0000 (+0000) Subject: os: FileJournal:: fix, uninitialization of FileJournal throttle X-Git-Tag: v0.93~85^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4036b91fc4bde4e5d39f020a1b6f403495837e11;p=ceph.git os: FileJournal:: fix, uninitialization of FileJournal throttle Since after firefly, take() in class throttle add if(0 == max.read()) return. If throttle is not initialized with max throttle value, it actually does not work. So initialize it in FileJournal Signed-off-by: Ning Yao --- diff --git a/src/os/FileJournal.h b/src/os/FileJournal.h index 878b9094b668..fa0b8876bf9d 100644 --- a/src/os/FileJournal.h +++ b/src/os/FileJournal.h @@ -379,8 +379,8 @@ private: full_state(FULL_NOTFULL), fd(-1), writing_seq(0), - throttle_ops(g_ceph_context, "filestore_ops"), - throttle_bytes(g_ceph_context, "filestore_bytes"), + throttle_ops(g_ceph_context, "filestore_ops", g_conf->journal_queue_max_ops), + throttle_bytes(g_ceph_context, "filestore_bytes", g_conf->journal_queue_max_bytes), write_lock("FileJournal::write_lock", false, true, false, g_ceph_context), write_stop(false), aio_stop(false),