mds: change mds_log_max_segments type from int to unsigned.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index ebe1cf397cf46c93c97372fc9d6e0715f41bb2d6..49f1a118bffbf3558bdaeaecc321627305e9f8d9 100644 (file)
--- 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 36af6cafb8adc2ec7685517d471bc31fcfd41454..2e58369929e17ffae540fbd07a78de14a6397a2c 100644 (file)
--- 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;