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

mimic: osd: take heartbeat_lock when calling heartbeat() #28220

Merged
merged 1 commit into from Jul 17, 2019

Conversation

@pdvian
Copy link

pdvian commented May 23, 2019

Fixes: http://tracker.ceph.com/issues/39439
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 7863d7c)

Conflicts:
	src/osd/OSD.cc : Resolved in _preboot
@@ -5312,7 +5313,10 @@ void OSD::_preboot(epoch_t oldest, epoch_t newest)
<< oldest << ".." << newest << dendl;

// ensure our local fullness awareness is accurate
heartbeat();
{
Mutex::Locker l(heartbeat_lock);

This comment has been minimized.

Copy link
@pdvian

pdvian May 23, 2019

Author

@liewegas need review. std::lock_guard is not being recognized in mimic.

This comment has been minimized.

Copy link
@smithfarm

smithfarm May 23, 2019

Contributor

@pdvian In addition to resolved for <function name> in the Conflicts section, could you also say something like "std::lock_guard is not being recognized in mimic; used Mutex::Locker instead"?

@smithfarm smithfarm added this to the mimic milestone May 23, 2019
@smithfarm smithfarm requested review from liewegas and neha-ojha May 23, 2019
@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Jun 26, 2019

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Jul 1, 2019

@pdvian this passed tests and can be merged as soon as @smithfarm comment is resolved

@yuriw yuriw removed needs-qa labels Jul 1, 2019
@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Jul 8, 2019

Copy link
Member

dzafman left a comment

LGTM

@yuriw yuriw merged commit 99be0d0 into ceph:mimic Jul 17, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.