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

osd/osd_types: fix pg_pool_t encoding for hammer #21282

Merged
merged 2 commits into from Apr 9, 2018
Merged

osd/osd_types: fix pg_pool_t encoding for hammer #21282

merged 2 commits into from Apr 9, 2018

Conversation

liewegas
Copy link
Member

@liewegas liewegas commented Apr 7, 2018

If we are missing the hammer feature, we will also be missing the
luminous feature, but we should still encode like hammer.

Analogous fix to e28e0c6

Signed-off-by: Sage Weil sage@redhat.com

@liewegas
osd/osd_types: fix pg_pool_t encoding for hammer
37c22b2 
If we are missing the hammer feature, we will also be missing the
luminous feature, but we should still encode like hammer.

Analogous fix to e28e0c6

Signed-off-by: Sage Weil <sage@redhat.com>
@tchaikov
Copy link
Contributor

tchaikov commented Apr 7, 2018

should be backported to luminous.

@liewegas
Copy link
Member Author

liewegas commented Apr 7, 2018 via email

@idryomov
Copy link
Contributor

idryomov commented Apr 9, 2018

@liewegas

/home/jenkins-build/build/workspace/ceph-pull-requests/src/osd/OSDMap.cc: In member function 'int OSDMap::Incremental::propagate_snaps_to_tiers(CephContext*, const OSDMap&)':
/home/jenkins-build/build/workspace/ceph-pull-requests/src/osd/OSDMap.cc:237:31: error: 'FLAG_SELFMANAGED_SNAPS' was not declared in this scope
  tier->flags |= base.flags & (FLAG_SELFMANAGED_SNAPS|
                               ^~~~~~~~~~~~~~~~~~~~~~
/home/jenkins-build/build/workspace/ceph-pull-requests/src/osd/OSDMap.cc:238:10: error: 'FLAG_POOL_SNAPS' was not declared in this scope
          FLAG_POOL_SNAPS);
          ^~~~~~~~~~~~~~~

@idryomov
Copy link
Contributor

idryomov commented Apr 9, 2018

Otherwise looks good. The kernel client isn't affected because OSD_POOLRESEND, NEW_OSDOP_ENCODING and SERVER_LUMINOUS were implemented together in 4.13. Older kernels actually get v14.

@tchaikov
Copy link
Contributor

tchaikov commented Apr 9, 2018 •
edited

yeah, aside from this compiling error, lgtm

@tchaikov tchaikov assigned liewegas and unassigned idryomov and jdurgin Apr 9, 2018
@liewegas
osd/OSDMap: propagate POOL_SNAPS|SELFMANAGED_SNAPS to tiers
8f6e2a1 
We set this when we add selfmanaged snaps to the base tier.  When those
propagate to the cache tier, propagate the flags, too!

Signed-off-by: Sage Weil <sage@redhat.com>
@liewegas liewegas merged commit bfff8ec into ceph:master Apr 9, 2018
@liewegas liewegas deleted the wip-pgpool-enc branch April 9, 2018 19:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tchaikov tchaikov tchaikov approved these changes

@jdurgin jdurgin jdurgin approved these changes

Assignees

@liewegas liewegas

Labels
bug-fix core
Projects
None yet
Milestone
No milestone
4 participants
@liewegas @tchaikov @idryomov @jdurgin