]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: change warn_interval_multiplier to uint32_t
authorLoic Dachary <loic@dachary.org>
Tue, 24 Sep 2013 17:04:23 +0000 (19:04 +0200)
committerSage Weil <sage@inktank.com>
Tue, 24 Sep 2013 17:27:48 +0000 (10:27 -0700)
to prevent overflow in OpTracker::check_ops_in_flight when
multiplying warn_interval_multiplier *= 2

Backport: cuttlefish, dumpling

http://tracker.ceph.com/issues/6370 fixes #6370

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 1bce1f009bffd3e28025a08775fec189907a81db)

src/osd/OpRequest.h

index fc8a8ab82c944182ca7b4cb54ecc75a9cac96b69..f4cc78553011c8879ccedabb7d238338a0ae75c9 100644 (file)
@@ -128,7 +128,7 @@ struct OpRequest : public TrackedOp {
   void set_pg_op() { rmw_flags |= CEPH_OSD_RMW_FLAG_PGOP; }
 
   utime_t received_time;
-  uint8_t warn_interval_multiplier;
+  uint32_t warn_interval_multiplier;
   utime_t get_arrived() const {
     return received_time;
   }