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:48 -0700 |
| commit | f6510c766592dbfa518e8667ed4d852d7e9319c0 (patch) | |
| tree | 563fc7142d89bc0854c9c9c2605ae8ad76c9c1e5 | |
| parent | 84e1f09626a718c42722ae97fa038004febb9671 (diff) | |
| download | ceph-f6510c766592dbfa518e8667ed4d852d7e9319c0.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 fc8a8ab82c9..f4cc7855301 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; } |