rgw/amqp: fix the "routable" delivery mode #34376
Conversation
src/rgw/rgw_amqp.cc
Outdated
| @@ -135,7 +137,10 @@ struct connection_t { | |||
| reply_type(AMQP_RESPONSE_NORMAL), | |||
| reply_code(RGW_AMQP_NO_REPLY_CODE), | |||
| ref_count(0), | |||
| cct(nullptr) {} | |||
| cct(nullptr), | |||
| next_reconnect(std::chrono::system_clock::now()), | |||
There was a problem hiding this comment.
ceph has its own clocks in common/ceph_time.h, please use these:
- std::chrono::system_clock::time_point next_reconnect;
+ ceph::real_time next_reconnect;
- next_reconnect(std::chrono::system_clock::now()),
+ next_reconnect(ceph::real_clock::now()),
- const std::chrono::system_clock::duration idle_time;
+ const ceph::timespan idle_time;there's also a lower-resolution ceph::coarse_real_clock that's cheaper to sample if that fits your use case
this option was not exposed to the configuration API however, it was still set, as hardcoded value in the code (details: https://www.rabbitmq.com/confirms.html#publisher-confirms) Fixes: https://tracker.ceph.com/issues/44915 Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
yuvalif
force-pushed
the
fix_amqp_routable_option
branch
from
c26074b
to
73db460
Compare
|
currently there are no amqp tests in teuthology, so, main goal is to make sure that rgw does not crash/deadlock or consume too much CPU due to the changes. teuthology run: http://pulpito.front.sepia.ceph.com/yuvalif-2020-04-22_15:10:04-rgw-fix_amqp_routable_option-distro-basic-smithi/
|
|
those dead jobs cover a large part of the rgw/verify suite. can you please rerun and see if they go away? |
new results: http://pulpito.front.sepia.ceph.com/yuvalif-2020-04-30_18:05:39-rgw-fix_amqp_routable_option-distro-basic-smithi/ |
this option was not exposed to the configuration API
however, it was still set, as hardcoded value in the code
(details:
https://www.rabbitmq.com/confirms.html#publisher-confirms)
Fixes: https://tracker.ceph.com/issues/44915
also, created delay if reconnect fails, and fixed some logs.
Signed-off-by: Yuval Lifshitz yuvalif@yahoo.com