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.

Sign up for GitHub

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

Jump to bottom

osd/osd_internal_types: wake snaptrimmer on put_read lock, too #13755

Merged
merged 2 commits into from Mar 6, 2017
Merged

osd/osd_internal_types: wake snaptrimmer on put_read lock, too #13755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9931798
osd/osd_internal_types: wake snaptrimmer on put_read lock, too
liewegas Mar 2, 2017
8ef5c56
qa/suites/rados/thrash: add no-thrash item to matrix
liewegas Mar 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions qa/suites/rados/thrash/thrashers/none.yaml
View file
Open in desktop
@@ -0,0 +1,3 @@
tasks:
- install:
- ceph:
46 changes: 14 additions & 32 deletions src/osd/osd_internal_types.h
View file
Open in desktop
Expand Up @@ -254,50 +254,32 @@ struct ObjectContext {
rwstate.put_read(ls);
rwstate.recovery_read_marker = false;
}
void put_read(list<OpRequestRef> *to_wake) {
rwstate.put_read(to_wake);
}
void put_excl(list<OpRequestRef> *to_wake,
bool *requeue_recovery,
bool *requeue_snaptrimmer) {
rwstate.put_excl(to_wake);
if (rwstate.empty() && rwstate.recovery_read_marker) {
rwstate.recovery_read_marker = false;
*requeue_recovery = true;
}
if (rwstate.empty() && rwstate.snaptrimmer_write_marker) {
rwstate.snaptrimmer_write_marker = false;
*requeue_snaptrimmer = true;
}
}
void put_write(list<OpRequestRef> *to_wake,
bool *requeue_recovery,
bool *requeue_snaptrimmer) {
rwstate.put_write(to_wake);
if (rwstate.empty() && rwstate.recovery_read_marker) {
rwstate.recovery_read_marker = false;
*requeue_recovery = true;
}
if (rwstate.empty() && rwstate.snaptrimmer_write_marker) {
rwstate.snaptrimmer_write_marker = false;
*requeue_snaptrimmer = true;
}
}
void put_lock_type(
ObjectContext::RWState::State type,
list<OpRequestRef> *to_wake,
bool *requeue_recovery,
bool *requeue_snaptrimmer) {
switch (type) {
case ObjectContext::RWState::RWWRITE:
return put_write(to_wake, requeue_recovery, requeue_snaptrimmer);
rwstate.put_write(to_wake);
break;
case ObjectContext::RWState::RWREAD:
return put_read(to_wake);
rwstate.put_read(to_wake);
break;
case ObjectContext::RWState::RWEXCL:
return put_excl(to_wake, requeue_recovery, requeue_snaptrimmer);
rwstate.put_excl(to_wake);
break;
default:
assert(0 == "invalid lock type");
}
if (rwstate.empty() && rwstate.recovery_read_marker) {
rwstate.recovery_read_marker = false;
*requeue_recovery = true;
}
if (rwstate.empty() && rwstate.snaptrimmer_write_marker) {
rwstate.snaptrimmer_write_marker = false;
*requeue_snaptrimmer = true;
}
}
bool is_request_pending() {
return (rwstate.count > 0);
Expand Down