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

mon: Don't put session during feature change #32365

Merged

Conversation

badone
Copy link
Contributor

@badone badone commented Dec 20, 2019

The session gets put as result of the set_session call in the next
block.

Fixes: https://tracker.ceph.com/issues/38345

Signed-off-by: Brad Hubbard bhubbard@redhat.com

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug

Show available Jenkins commands
  • jenkins retest this please
  • 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 backend
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

The session gets put as result of the set_session call in the next
block.

Fixes: https://tracker.ceph.com/issues/38345

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
@badone badone force-pushed the wip-feature-change-put-off-by-one-error branch from 4421372 to 8f23f2c Compare December 20, 2019 21:27
src/mon/Monitor.cc Show resolved Hide resolved
@liewegas
Copy link
Member

@badone ?

@badone
Copy link
Contributor Author

badone commented Jan 20, 2020

From memory the act of calling set_session replaces the old session and there is an implicit put when ~intrusive_ptr() is called. I tested this with refcounted object debugging and the count is correct with this patch whereas we call put one too many times without.

@liewegas liewegas dismissed tchaikov’s stale review January 28, 2020 20:08

chinese new year!

liewegas added a commit that referenced this pull request Jan 28, 2020
* refs/pull/32365/head:
	mon: Don't put session during feature change

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
@liewegas liewegas merged commit 8f23f2c into ceph:master Jan 28, 2020
@badone badone deleted the wip-feature-change-put-off-by-one-error branch January 28, 2020 22:02
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.

4 participants