]> git.baikalelectronics.ru Git - kernel.git/commit
libceph: fix PG split vs OSD (re)connect race
authorIlya Dryomov <idryomov@gmail.com>
Tue, 20 Aug 2019 14:40:33 +0000 (16:40 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Thu, 22 Aug 2019 08:47:41 +0000 (10:47 +0200)
commit5a22aae522eb662ef13ddce89e4c92c97e6083df
tree127a3d36333bde7df8e049ba40dd0c93402620c0
parenta41e0893929ea8c9d39cf92cfcbec7c9096c5348
libceph: fix PG split vs OSD (re)connect race

We can't rely on ->peer_features in calc_target() because it may be
called both when the OSD session is established and open and when it's
not.  ->peer_features is not valid unless the OSD session is open.  If
this happens on a PG split (pg_num increase), that could mean we don't
resend a request that should have been resent, hanging the client
indefinitely.

In userspace this was fixed by looking at require_osd_release and
get_xinfo[osd].features fields of the osdmap.  However these fields
belong to the OSD section of the osdmap, which the kernel doesn't
decode (only the client section is decoded).

Instead, let's drop this feature check.  It effectively checks for
luminous, so only pre-luminous OSDs would be affected in that on a PG
split the kernel might resend a request that should not have been
resent.  Duplicates can occur in other scenarios, so both sides should
already be prepared for them: see dup/replay logic on the OSD side and
retry_attempt check on the client side.

Cc: stable@vger.kernel.org
Fixes: 23f46420feef ("libceph: resend on PG splits if OSD has RESEND_ON_SPLIT")
Link: https://tracker.ceph.com/issues/41162
Reported-by: Jerry Lee <leisurelysw24@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Tested-by: Jerry Lee <leisurelysw24@gmail.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
net/ceph/osd_client.c