From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 4 Nov 2022 13:42:52 +0000 (-0400)
Subject: mds: retype to properly sized unsigned ints
X-Git-Tag: v19.0.0~760^2~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=91b6bc4a012e2976bd66054bf21f7aefa18e4577;p=ceph.git

mds: retype to properly sized unsigned ints

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index 024b564c151d..5e1540862d30 100644
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -670,7 +670,7 @@ void MDLog::trim(int m)
 
     unsigned num_remaining_segments = (segments.size() - expired_segments.size() - expiring_segments.size());
     if ((num_remaining_segments <= max_segments) &&
-	(max_ev < 0 || num_events - expiring_events - expired_events <= max_ev))
+	(max_ev < 0 || (num_events - expiring_events - expired_events) <= (uint64_t)max_ev))
       break;
 
     // Do not trim too many segments at once for peak workload. If mds keeps creating N segments each tick,
diff --git a/src/mds/MDLog.h b/src/mds/MDLog.h
index eb15e08f5f28..d5e7c5a8a7df 100644
--- a/src/mds/MDLog.h
+++ b/src/mds/MDLog.h
@@ -114,8 +114,8 @@ public:
 
   void flush_logger();
 
-  size_t get_num_events() const { return num_events; }
-  size_t get_num_segments() const { return segments.size(); }
+  uint64_t get_num_events() const { return num_events; }
+  uint64_t get_num_segments() const { return segments.size(); }
 
   auto get_debug_subtrees() const {
     return events_per_segment;
@@ -263,8 +263,8 @@ protected:
     segments.erase(p);
   }
 
-  int num_events = 0; // in events
-  int unflushed = 0;
+  uint64_t num_events = 0; // in events
+  uint64_t unflushed = 0;
   bool mds_is_shutting_down = false;
 
   // Log position which is persistent *and* for which
@@ -287,8 +287,8 @@ protected:
   std::set<LogSegment*> expired_segments;
   std::size_t pre_segments_size = 0;            // the num of segments when the mds finished replay-journal, to calc the num of segments growing
   uint64_t event_seq = 0;
-  int expiring_events = 0;
-  int expired_events = 0;
+  uint64_t expiring_events = 0;
+  uint64_t expired_events = 0;
 
   int64_t mdsmap_up_features = 0;
   std::map<uint64_t,std::list<PendingEvent> > pending_events; // log segment -> event list