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

hammer: Protect against excessively large object map sizes #8401

Merged
1 commit merged into from Apr 6, 2016
Merged

hammer: Protect against excessively large object map sizes #8401

1 commit merged into from Apr 6, 2016

Conversation

Vicente-Cheng
Copy link
Contributor

@Vicente-Cheng
cls_rbd: protect against excessively large object maps
97f474f 
Fixes: ceph#15121

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 4aff4ea)

  Conflicts:
	src/cls/rbd/cls_rbd.cc
        `RBD_METADATA_KEY_PREFIX` is not introduced on hammer, so remove
        it
@smithfarm smithfarm added this to the hammer milestone Mar 31, 2016
ghost pushed a commit that referenced this pull request Apr 5, 2016
Merge pull request #8401: hammer: Protect against excessively large o…
ce7ef8d 
…bject map sizes

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

ghost commented Apr 6, 2016

@dillaman it passed a run of the rbd suite ( http://tracker.ceph.com/issues/14692#note-49 ), do you think it is ready to be merged ?

@ghost ghost assigned dillaman Apr 6, 2016
@ghost
Copy link

ghost commented Apr 6, 2016

commit=97f474fb6b26ae7b7e2fdd21de4f4bd98cdd56ab ; picked_from=$(git show --no-patch --pretty=%b $commit | perl -ne 'print if(s/.cherry pick. from commit (\w+).*/$1/)') ; diff -u --ignore-matching-lines '^[^+-]' <(git show $picked_from) <(git show $commit)

returns nothing, proof that the conflict resolution was in the hunk context

@ghost ghost closed this Apr 6, 2016
@ghost ghost reopened this Apr 6, 2016
@ghost
Copy link

ghost commented Apr 6, 2016

shoot, closed by accident

@dillaman
Copy link

dillaman commented Apr 6, 2016

lgtm 👍

@ghost ghost merged commit 77fbf58 into ceph:hammer Apr 6, 2016
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

@dillaman dillaman

Labels
bug-fix rbd
Projects
None yet
Milestone
hammer
3 participants
@Vicente-Cheng @dillaman @smithfarm