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:27:57 -0700 |
| commit | 0ff5b4a96833681e92cc41f019a569134474f4cf (patch) | |
| tree | e90f9a62236648a3e80e356c80b11cccc633dc01 | |
| parent | fb15040b6cec6221baa550ddfffade823f784c4a (diff) | |
| download | ceph-0ff5b4a96833681e92cc41f019a569134474f4cf.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 e72f03d1d77..0c544c2ec59 100644 --- a/src/osd/OpRequest.h +++ b/src/osd/OpRequest.h @@ -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; } |