fix FTBFS introduced by d0af316 #7792
Merged
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
Signed-off-by: Kefu Chai <kchai@redhat.com>
ghost
added
Reviewed-by: Loic Dachary <ldachary@redhat.com> after gitbuilders are happy and the make check completes. |
|
@athanatos 557c3bf fixes a regression which breaks the scrub tests. |
Signed-off-by: Kefu Chai <kchai@redhat.com>
the destructor of Scrub::Store asserts that `this->results` should always be empty when it is free'd. before this change, if we are repairing, the results is not flushed or cleaned up, this crashes osd daemon when a new PG internval comes. also we should not keep the results around even we don't want to populate them to the omap if we are repairing, it's just a waste. Signed-off-by: Kefu Chai <kchai@redhat.com>
|
i wish it were in master =) |
ghost
pushed a commit
that referenced
this pull request
Feb 25, 2016
fix FTBFS introduced by d0af316 Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost
merged commit
This pull request was closed.
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.
No description provided.