summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoic Dachary <loic@dachary.org>2013-09-24 19:04:23 +0200
committerLoic Dachary <loic@dachary.org>2013-09-24 19:12:35 +0200
commit1bce1f009bffd3e28025a08775fec189907a81db (patch)
tree61772cc336bc564b0fa4616ba39354659edf08e8
parent2cbe93b84025a840de3695df999cb3adf1da6aed (diff)
downloadceph-1bce1f009bffd3e28025a08775fec189907a81db.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>
-rw-r--r--src/osd/OpRequest.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osd/OpRequest.h b/src/osd/OpRequest.h
index 50ade71a1b9..9634be87846 100644
--- a/src/osd/OpRequest.h
+++ b/src/osd/OpRequest.h
@@ -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;
}