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

luminous: src/common/LogClient.cc: 310: FAILED assert(num_unsent <= log_queue.size()) #17197

Merged
merged 3 commits into from Aug 23, 2017

Conversation

Projects
None yet
3 participants
@theanalyst
Member

theanalyst commented Aug 23, 2017

liewegas added some commits Aug 4, 2017

common/LogClient: assign seq and queue atomically
The _get_mon_log_message() assumes that log_last and log_queue
are in sync, but it was previously possible to increment log_last
setting e.seq in do_log(), and only later queue it.  If a racing
thread ran get_mon_log_message() in the meantime it would fail
an assertion.

Fix by assigning the seq and queueing it atomically.  If the
cluster log is not enabled, use the get_next_seq() helper so that
graylog or syslog messages still have a seq assigned.

Fixes: http://tracker.ceph.com/issues/18209
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1f8f58b)
common/LogClient: fix indentation
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit bf92a8a)
common/LogClient: make last_log non-atomic
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit c36a98b)

@theanalyst theanalyst self-assigned this Aug 23, 2017

@theanalyst theanalyst added this to the luminous milestone Aug 23, 2017

@theanalyst theanalyst requested a review from tchaikov Aug 23, 2017

@liewegas

This comment has been minimized.

Member

liewegas commented Aug 23, 2017

retest this please

@theanalyst

This comment has been minimized.

Member

theanalyst commented Aug 23, 2017

@tchaikov @liewegas merge at will

@liewegas liewegas merged commit 4e26d5e into ceph:luminous Aug 23, 2017

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