]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: change warn_interval_multiplier to uint32_t 630/head
authorLoic Dachary <loic@dachary.org>
Tue, 24 Sep 2013 17:04:23 +0000 (19:04 +0200)
committerLoic Dachary <loic@dachary.org>
Tue, 24 Sep 2013 17:12:35 +0000 (19:12 +0200)
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>
src/osd/OpRequest.h

index 50ade71a1b916b260e91b8013a936b26e29e0260..9634be878462b0ed956bbf95b133ab32ed277492 100644 (file)
@@ -135,7 +135,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;
   }