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

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

Merged
3 commits merged into from Sep 7, 2015

Conversation

Projects
None yet
3 participants
@ghost
Copy link

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

Merge pull request #5764: common: do not insert emtpy ptr when rebuil…
…d emtpy bufferlist

Reviewed-by: Loic Dachary <ldachary@redhat.com>

XinzeChi added some commits Aug 24, 2015

test: add test case for insert empty ptr when buffer rebuild
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
(cherry picked from commit 2d2f0eb)
common: fix insert empty ptr when bufferlist rebuild
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
common: fix code format
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
(cherry picked from commit 15e5ebe)
@ghost

This comment has been minimized.

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

This comment has been minimized.

Copy link
Member

liewegas commented Sep 7, 2015

👍

ghost pushed a commit that referenced this pull request Sep 7, 2015

Loic Dachary
Merge pull request #5764 from dachary/wip-12847-hammer
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 issue was closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.