]> 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:28:24 +0000 (10:28 -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 ca419f34ff88c8170c7b5f5e4660502e15d1f640..61c3f4549542f31fed50904d5383964c8ceaaef1 100644 (file)
@@ -126,7 +126,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;
   }