Skip to content

rgw/amqp: remove possible race conditions with the amqp connections#52110

Merged
yuvalif merged 2 commits intoceph:mainfrom
yuvalif:wip-yuval-fix-61639
Jun 25, 2023
Merged

rgw/amqp: remove possible race conditions with the amqp connections#52110
yuvalif merged 2 commits intoceph:mainfrom
yuvalif:wip-yuval-fix-61639

Conversation

@yuvalif
Copy link
Contributor

@yuvalif yuvalif commented Jun 18, 2023

  • simplify memory management of the connection by not using a unique_ptr
  • simplify the logic by handling all issues inside the amqp manager
  • fix iterator invalidation issue with miltiple n/acks
  • allow different connections with different exchanges
  • modify the unit tests according to the new behavior

Fixes:

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows

* simplify memory management of the connection by not using a unique_ptr
* simplify the logic by handling all issues inside the amqp manager
* fix iterator invalidation issue with miltiple n/acks
* allow different connections with different exchanges
* modify the unit tests according to the new behavior

Fixes:
* https://tracker.ceph.com/issues/61639
* https://tracker.ceph.com/issues/46127

Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
@yuvalif
Copy link
Contributor Author

yuvalif commented Jun 22, 2023


std::string to_string(const connection_id_t& id) {
return id.host+":"+std::to_string(id.port)+id.vhost;
return std::string("amqp")+(id.ssl ? "s" : "")+"://"+id.host+":"+std::to_string(id.port)+id.vhost+"?exchange="+id.exchange;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably worth using fmt::format() to clean this up. string::operator+ which can be expensive if we can't fit everything in the short string optimization, as each operator+ could end up reallocating

return fmt::format("{}://{}:{}{}?exchange={}",
                   id.ssl ? "amqps" : "amqp",
                   id.host, id.port, id.vhost, id.exchange);

Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants