From db1635324aa20fb488c339e7673a901fe3f111d4 Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Fri, 26 Jun 2015 10:01:43 +0800 Subject: [PATCH] mds: change mds_log_max_segments type from int to unsigned. Signed-off-by: Jianpeng Ma --- src/common/config_opts.h | 2 +- src/mds/MDLog.cc | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/common/config_opts.h b/src/common/config_opts.h index ebe1cf397cf..49f1a118bff 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -387,7 +387,7 @@ OPTION(mds_log_max_events, OPT_INT, -1) OPTION(mds_log_events_per_segment, OPT_INT, 1024) OPTION(mds_log_segment_size, OPT_INT, 0) // segment size for mds log, // defaults to g_default_file_layout.fl_object_size (4MB) -OPTION(mds_log_max_segments, OPT_INT, 30) +OPTION(mds_log_max_segments, OPT_U32, 30) OPTION(mds_log_max_expiring, OPT_INT, 20) OPTION(mds_bal_sample_interval, OPT_FLOAT, 3.0) // every 5 seconds OPTION(mds_bal_replicate_threshold, OPT_FLOAT, 8000) diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc index 36af6cafb8a..2e58369929e 100644 --- a/src/mds/MDLog.cc +++ b/src/mds/MDLog.cc @@ -542,7 +542,7 @@ void MDLog::_journal_segment_subtree_map(MDSInternalContextBase *onsync) void MDLog::trim(int m) { - int max_segments = g_conf->mds_log_max_segments; + unsigned max_segments = g_conf->mds_log_max_segments; int max_events = g_conf->mds_log_max_events; if (m >= 0) max_events = m; @@ -575,8 +575,7 @@ void MDLog::trim(int m) while (segments.size() > 1 && p != segments.end() && ((max_events >= 0 && num_events - expiring_events - expired_events > max_events) || - (max_segments >= 0 && - segments.size() - expiring_segments.size() - expired_segments.size() > (unsigned)max_segments))) { + (segments.size() - expiring_segments.size() - expired_segments.size() > max_segments))) { if (stop < ceph_clock_now(g_ceph_context)) break; -- 2.47.3