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

osd/osd_types: fix pg_pool_t encoding for hammer #21282

Merged
merged 2 commits into from Apr 9, 2018

Conversation

Projects
None yet
4 participants
@liewegas
Copy link
Member

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

osd/osd_types: fix pg_pool_t encoding for hammer
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

This comment has been minimized.

Copy link
Contributor

commented Apr 7, 2018

should be backported to luminous.

@tchaikov tchaikov added the backport label Apr 7, 2018

@liewegas

This comment has been minimized.

Copy link
Member Author

commented Apr 7, 2018

@tchaikov tchaikov added the needs-qa label Apr 8, 2018

@jdurgin

jdurgin approved these changes Apr 8, 2018

@idryomov

This comment has been minimized.

Copy link
Contributor

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

This comment has been minimized.

Copy link
Contributor

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

This comment has been minimized.

Copy link
Contributor

commented Apr 9, 2018

yeah, aside from this compiling error, lgtm

osd/OSDMap: propagate POOL_SNAPS|SELFMANAGED_SNAPS to tiers
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 force-pushed the liewegas:wip-pgpool-enc branch from cef80a3 to 8f6e2a1 Apr 9, 2018

@liewegas liewegas merged commit bfff8ec into ceph:master Apr 9, 2018

3 of 5 checks passed

make check make check failed
Details
make check (arm64) make check failed
Details
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details

@liewegas liewegas deleted the liewegas:wip-pgpool-enc branch Apr 9, 2018

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.