From: Luis Henriques <lhenriques@suse.com>
To: Sage Weil <sage@newdream.net>
Cc: Ilya Dryomov <idryomov@gmail.com>,
Jeff Layton <jlayton@kernel.org>,
"Yan, Zheng" <ukernel@gmail.com>,
Ceph Development <ceph-devel@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [RFC PATCH 0/2] ceph: safely use 'copy-from' Op on Octopus OSDs
Date: Mon, 11 Nov 2019 16:30:36 +0000 [thread overview]
Message-ID: <20191111163036.GA20513@hermes.olymp> (raw)
In-Reply-To: <20191108173101.GA3300@hermes.olymp>
On Fri, Nov 08, 2019 at 05:31:01PM +0000, Luis Henriques wrote:
<snip>
> > - You'll need to add it for both OSDMap::Incremental and OSDMap
> > - You'll need to make the encoding condition by updating the block like
> > the one below from OSDMap::encode()
> >
> > uint8_t v = 9;
> > if (!HAVE_FEATURE(features, SERVER_LUMINOUS)) {
> > v = 3;
> > } else if (!HAVE_FEATURE(features, SERVER_MIMIC)) {
> > v = 6;
> > } else if (!HAVE_FEATURE(features, SERVER_NAUTILUS)) {
> > v = 7;
> > }
> >
> > to include a SERVER_OCTOPUS case too. Same goes for Incremental::encode()
>
> Awesome, thanks! I'll give it a try, and test it with the appropriate
> kernel client side changes to use this.
Ok, I've got the patch bellow for the OSD code, which IIRC should do
exactly what we want: duplicate the require_osd_release in the client
side.
Now, in order to quickly test this I've started adding flags to the
CEPH_FEATURES_SUPPORTED_DEFAULT definition. SERVER_MIMIC *seemed* to be
Ok, but once I've added SERVER_NAUTILUS I've realized that we'll need to
handle TYPE_MSGR2 address. Which is a _big_ thing. Is anyone already
looking into adding support for msgr v2 to the kernel client?
Cheers,
--
Luís
diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 6b5930743a33..b38d91d98fcf 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -555,13 +555,15 @@ void OSDMap::Incremental::encode(ceph::buffer::list& bl, uint64_t features) cons
ENCODE_START(8, 7, bl);
{
- uint8_t v = 8;
+ uint8_t v = 9;
if (!HAVE_FEATURE(features, SERVER_LUMINOUS)) {
v = 3;
} else if (!HAVE_FEATURE(features, SERVER_MIMIC)) {
v = 5;
} else if (!HAVE_FEATURE(features, SERVER_NAUTILUS)) {
v = 6;
+ } else if (!HAVE_FEATURE(features, SERVER_OCTOPUS)) {
+ v = 8;
}
ENCODE_START(v, 1, bl); // client-usable data
encode(fsid, bl);
@@ -611,6 +613,9 @@ void OSDMap::Incremental::encode(ceph::buffer::list& bl, uint64_t features) cons
encode(new_last_up_change, bl);
encode(new_last_in_change, bl);
}
+ if (v >= 9) {
+ encode(new_require_osd_release, bl);
+ }
ENCODE_FINISH(bl); // client-usable data
}
@@ -816,7 +821,7 @@ void OSDMap::Incremental::decode(ceph::buffer::list::const_iterator& bl)
return;
}
{
- DECODE_START(8, bl); // client-usable data
+ DECODE_START(9, bl); // client-usable data
decode(fsid, bl);
decode(epoch, bl);
decode(modified, bl);
@@ -2847,13 +2852,15 @@ void OSDMap::encode(ceph::buffer::list& bl, uint64_t features) const
{
// NOTE: any new encoding dependencies must be reflected by
// SIGNIFICANT_FEATURES
- uint8_t v = 9;
+ uint8_t v = 10;
if (!HAVE_FEATURE(features, SERVER_LUMINOUS)) {
v = 3;
} else if (!HAVE_FEATURE(features, SERVER_MIMIC)) {
v = 6;
} else if (!HAVE_FEATURE(features, SERVER_NAUTILUS)) {
v = 7;
+ } else if (!HAVE_FEATURE(features, SERVER_OCTOPUS)) {
+ v = 9;
}
ENCODE_START(v, 1, bl); // client-usable data
// base
@@ -2929,6 +2936,9 @@ void OSDMap::encode(ceph::buffer::list& bl, uint64_t features) const
encode(last_up_change, bl);
encode(last_in_change, bl);
}
+ if (v >= 10) {
+ encode(require_osd_release, bl);
+ }
ENCODE_FINISH(bl); // client-usable data
}
@@ -3170,7 +3180,7 @@ void OSDMap::decode(ceph::buffer::list::const_iterator& bl)
* Since we made it past that hurdle, we can use our normal paths.
*/
{
- DECODE_START(9, bl); // client-usable data
+ DECODE_START(10, bl); // client-usable data
// base
decode(fsid, bl);
decode(epoch, bl);
next prev parent reply other threads:[~2019-11-11 16:30 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-08 14:15 [RFC PATCH 0/2] ceph: safely use 'copy-from' Op on Octopus OSDs Luis Henriques
2019-11-08 14:15 ` [RFC PATCH 1/2] ceph: add support for sending truncate_{seq,size} in 'copy-from' Op Luis Henriques
2019-11-08 14:15 ` [RFC PATCH 2/2] ceph: make 'copyfrom' a default mount option again Luis Henriques
2019-11-08 15:15 ` [RFC PATCH 0/2] ceph: safely use 'copy-from' Op on Octopus OSDs Ilya Dryomov
2019-11-08 16:47 ` Luis Henriques
2019-11-08 16:57 ` Sage Weil
2019-11-08 17:16 ` Luis Henriques
2019-11-08 17:22 ` Sage Weil
2019-11-08 17:31 ` Luis Henriques
2019-11-11 16:30 ` Luis Henriques [this message]
2019-11-11 20:51 ` Ilya Dryomov
2019-11-12 10:42 ` Luis Henriques
2019-11-08 16:59 ` Ilya Dryomov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191111163036.GA20513@hermes.olymp \
--to=lhenriques@suse.com \
--cc=ceph-devel@vger.kernel.org \
--cc=idryomov@gmail.com \
--cc=jlayton@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sage@newdream.net \
--cc=ukernel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.