Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rgw: pass boost intrusive_ptr to DataLogBackends flat_map #51962

Merged
merged 1 commit into from Jun 15, 2023

Conversation

vedanshbhartia
Copy link
Contributor

@vedanshbhartia vedanshbhartia commented Jun 7, 2023

When emplacing a new backend, use an explicitly constructed intrusive_ptr so that it gets destroyed if the emplace fails.

Though the destructor is already called, this behaviour cannot be relied upon. std::map does not exhibit the same behaviour, and would have leaked memory had it been used instead.

Fixes coverity defect ID 1511072

Checklist

  • 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

When emplacing a new backend, use an explicitly constructed
intrusive_ptr so that it gets destroyed if the emplace fails.

Though the destructor is already called, this behaviour cannot be relied
upon. std::map does not exhibit the same behaviour, and would have
leaked memory had it been used instead.

Signed-off-by: Vedansh Bhartia <vedanshbhartia@gmail.com>
@vedanshbhartia vedanshbhartia requested a review from a team as a code owner June 7, 2023 15:41
@github-actions github-actions bot added the rgw label Jun 7, 2023
Copy link
Contributor

@adamemerson adamemerson left a comment

Choose a reason for hiding this comment

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

Thank you.

@mattbenjamin
Copy link
Contributor

intrusive_ptr++

@yuvalif
Copy link
Contributor

yuvalif commented Jun 8, 2023

@yuvalif
Copy link
Contributor

yuvalif commented Jun 8, 2023

jenkins test make check

@alimaredia alimaredia self-requested a review June 12, 2023 18:55
@alimaredia
Copy link
Contributor

alimaredia commented Jun 12, 2023

Teuthology run looks good

Edit: I see the same seg faults as I see in (#51676 (comment)) in tests that fail because of valgrind. I'm guessing this is a known issue, once I confirm I will merge.

@yuvalif yuvalif merged commit ff440a1 into ceph:main Jun 15, 2023
12 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants