diff options
| author | Loic Dachary <loic@dachary.org> | 2013-09-24 19:04:23 +0200 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-09-24 10:28:24 -0700 |
| commit | 6f342872cdd211e24deb19f5e00380494514c437 (patch) | |
| tree | 182c6bd0bc1815a700275d3e49bab567cb626307 | |
| parent | be2907ef85a31c2be8be7446fe71f5d2e1410ec0 (diff) | |
| download | ceph-6f342872cdd211e24deb19f5e00380494514c437.tar.gz | |
osd: change warn_interval_multiplier to uint32_t
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)
| -rw-r--r-- | src/osd/OpRequest.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osd/OpRequest.h b/src/osd/OpRequest.h index ca419f34ff8..61c3f454954 100644 --- a/src/osd/OpRequest.h +++ b/src/osd/OpRequest.h @@ -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; } |