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: Don't include user changeable flag in snaptrim related assert #28202

Merged
merged 1 commit into from Jul 1, 2019

Conversation

@dzafman
Copy link
Member

dzafman commented May 21, 2019

Caused by: a53ba73

Fixes: http://tracker.ceph.com/issues/38124

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 63c2060)

Conflicts:
	src/osd/PrimaryLogPG.h (Use assert() in mimic)
@dzafman dzafman added this to the mimic milestone May 21, 2019
@smithfarm smithfarm requested review from liewegas, athanatos and neha-ojha and removed request for athanatos May 21, 2019
@athanatos

This comment has been minimized.

Copy link
Contributor

athanatos commented May 22, 2019

This backport look ok to me, but did we fix the underlying race?

@dzafman

This comment has been minimized.

Copy link
Member Author

dzafman commented May 22, 2019

@athanatos I considered it a race with the assert. I assumed that if snap trim got as far as WaitReservation::react(const SnapTrimReserved&), can_trim() includes nosnaptrim and wouldn't proceed. Before nosnaptrim was added, the assert was correct. But afterwards the assert raced with the user setting nosnaptrim.

@athanatos

This comment has been minimized.

Copy link
Contributor

athanatos commented May 28, 2019

Ah, so setting CEPH_OSDMAP_NOSNAPTRIM doesn't necessarily cancel an in-progress trim. Ok, LGTM.

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Jun 26, 2019

@yuriw yuriw merged commit 61d80af into ceph:mimic Jul 1, 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.