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

jewel: osd: condition OSDMap encoding on features #12167

Merged
5 commits merged into from Dec 5, 2016
Merged

jewel: osd: condition OSDMap encoding on features #12167

5 commits merged into from Dec 5, 2016

Commits on Nov 23, 2016

  1. osd/osd_types: conditional pg_pool_t encoding 

    Align this with decode.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 01d9e8a)
    @liewegas
    liewegas committed Nov 23, 2016
    Copy the full SHA
    85caf34 View commit details
    Browse the repository at this point in the history

  2. osd/osd_types: encode pg_pool_t like hammer if features indicate hammer 

    If the target features are missing the new OSDOp encoding, the
first feature we added post-hammer, encode like hammer.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 2f8cfb6)
    @liewegas
    liewegas committed Nov 23, 2016
    Copy the full SHA
    c66c556 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2016

  1. crush/CrushWrapper: drop unused 'lean' encode() argument 

    No callers, no users.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 638a38b)

Conflicts:
	src/crush/CrushWrapper.h

[trivial conflict due to removal of write_file and read_file]
    @liewegas
    liewegas committed Nov 28, 2016
    Copy the full SHA
    c5f5b94 View commit details
    Browse the repository at this point in the history

  2. crush/CrushWrapper: encode with features 

    No behavior change yet; just fixing callers.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit b7c9e05)

[Updated write_file to use all feaetures]
[Updated OSDMonitor.cc to use mon->quorum_features instead of the
 mon->get_quorum_con_featuers() helper]
[trivial conflict from removed write_file and read_file]

Conflicts:
	src/crush/CrushWrapper.h
	src/mgr/PyModules.cc
	src/mon/OSDMonitor.cc
	src/tools/ceph_monstore_tool.cc
    @liewegas
    liewegas committed Nov 28, 2016
    Copy the full SHA
    bf96b30 View commit details
    Browse the repository at this point in the history

  3. crush: condition latest tunable encoding on features 

    This avoids throwing hammer OSDMap encodings off.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 9e5ff86)
    @liewegas
    liewegas committed Nov 28, 2016
    Copy the full SHA
    4d6f848 View commit details
    Browse the repository at this point in the history