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

Jump to bottom

common: do not insert emtpy ptr when rebuild emtpy bufferlist #5764

Merged
3 commits merged into from Sep 7, 2015
Merged

common: do not insert emtpy ptr when rebuild emtpy bufferlist #5764

3 commits merged into from Sep 7, 2015

Conversation

ghost
Copy link

@ghost ghost commented Sep 2, 2015

@ghost ghost self-assigned this Sep 2, 2015
@ghost ghost added this to the hammer milestone Sep 2, 2015
@ghost ghost added bug-fix core labels Sep 2, 2015
ghost pushed a commit that referenced this pull request Sep 2, 2015
@ldachary
Merge pull request #5764: common: do not insert emtpy ptr when rebuil…
e24f229 
…d emtpy bufferlist

Reviewed-by: Loic Dachary <ldachary@redhat.com>
@XinzeChi @ldachary
common: fix insert empty ptr when bufferlist rebuild
2b0b7ae 
Fixes: #12775
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
(cherry picked from commit fb1b6dd)

Conflicts:
	src/common/buffer.cc : because invalidate_crc did not exist
        in hammer
@XinzeChi @ldachary
test: add test case for insert empty ptr when buffer rebuild
aab35da 
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
(cherry picked from commit 2d2f0eb)
@XinzeChi @ldachary
common: fix code format
aa00373 
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
(cherry picked from commit 15e5ebe)
@loic-bot
Copy link

loic-bot commented Sep 3, 2015

SUCCESS: http://jenkins.ceph.dachary.org/job/ceph/7448/

@ghost
Copy link
Author

ghost commented Sep 6, 2015

@liewegas this hammer backport passed a rados suite (see http://tracker.ceph.com/issues/12701#note-62 for the details). Do you think it is ready to be merged ?

@ghost ghost assigned liewegas and unassigned ghost Sep 6, 2015
@liewegas
Copy link
Member

liewegas commented Sep 7, 2015

👍

ghost pushed a commit that referenced this pull request Sep 7, 2015
Merge pull request #5764 from dachary/wip-12847-hammer
e9db807 
common: do not insert emtpy ptr when rebuild emtpy bufferlist

Reviewed-by: Sage Weil <sage@redhat.com>
@ghost ghost merged commit e9db807 into ceph:hammer Sep 7, 2015
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@liewegas liewegas

Labels
bug-fix core
Projects
None yet
Milestone
hammer
3 participants
@loic-bot @liewegas @XinzeChi