os/bluestore: include modified objects in flush list even if onode unchanged #12541
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xiexingguo
approved these changes
Dec 17, 2016
liewegas
force-pushed
the
wip-bluestore-omap-flush
branch
2 times, most recently
from
05ea2ad
to
1f77e5c
Compare
ifed01
reviewed
Dec 19, 2016
| if (o->flush_txns.empty()) | ||
| o->flush_cond.notify_all(); | ||
| } | ||
| } | ||
| // clear out refs | ||
| txc->onodes.clear(); | ||
|
|
There was a problem hiding this comment.
clear modified_objects here similar as we do for onodes?
ifed01
reviewed
Dec 19, 2016
| @@ -6417,6 +6417,13 @@ void BlueStore::_txc_write_nodes(TransContext *txc, KeyValueDB::Transaction t) | |||
| o->flush_txns.insert(txc); | |||
| } | |||
|
|
|||
| for (auto o : txc->modified_objects) { | |||
| if (txc->onodes.count(o) == 0) { | |||
There was a problem hiding this comment.
We can remove onode from modified_objects here if it's present in onodes and hence avoid the same check in _txc_finish.
ifed01
reviewed
Dec 19, 2016
| @@ -6489,7 +6496,17 @@ void BlueStore::_txc_finish(TransContext *txc) | |||
| if ((*p)->flush_txns.empty()) | |||
| (*p)->flush_cond.notify_all(); | |||
| } | |||
|
|
|||
| for (auto o : txc->modified_objects) { | |||
There was a problem hiding this comment.
If modified_objects is normalized in _txc_write_nodes then we can replace both loops with something like
set* sets[] = {&(txc->onodes), &(txc->modified_objects), nullptr);
for( set** _set = sets; *_set != nullptr, ++_set){
for( set::iterator p = _set->begin();
...
}
|
Shouldn't we call txc->modified_object.erase(o) in _do_remove similar to txc->onodes.erase(o) ??? |
liewegas
force-pushed
the
wip-bluestore-omap-flush
branch
4 times, most recently
from
9864bf8
to
00f277e
Compare
|
LGTM |
liewegas
force-pushed
the
wip-bluestore-omap-flush
branch
from
00f277e
to
30455c0
Compare
…changed We use the onode flush list so that we can ->flush() as a barrier before doing any read/modify/write. For example, omap_rmkeyrange will flush before reading to see what keys to erase in order to ensure that any previous inserts are applied to the db and we see them and remove them. However, some omap operations don't update the onode itself, which means write_onode() doesn't get called and we aren't put on this list. Add a note_modified_object() helper that can be called instead of write_onode() for those cases. That way we get on the list and flush() works as expected. We could have resolved this by just putting ourselves on the dirty onode list, but in practice every OSD op is writing omap keys to the pgmeta object and there is no need to touch the onode key in this case, so doing so would be a big regression. Signed-off-by: Sage Weil <sage@redhat.com>
liewegas
force-pushed
the
wip-bluestore-omap-flush
branch
from
30455c0
to
1b319f2
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We use the onode flush list so that we can ->flush() as
a barrier before doing any read/modify/write. For
example, omap_rmkeyrange will flush before reading to
see what keys to erase in order to ensure that any
previous inserts are applied to the db and we see them
and remove them.
However, some omap operations don't update the onode
itself, which means write_onode() doesn't get called and
we aren't put on this list.
Add a note_modified_object() helper that can be called
instead of write_onode() for those cases. That way we
get on the list and flush() works as expected.
Signed-off-by: Sage Weil sage@redhat.com