Received: by 2002:a25:c205:0:0:0:0:0 with SMTP id s5csp575398ybf; Fri, 28 Feb 2020 03:42:13 -0800 (PST) X-Google-Smtp-Source: APXvYqzcO53/OIF35JYLM+ACVsazyDLVw3u+xIQBc/ox0DixVdpDEYyKcqYPmgAOzEgYwyXzTWtr X-Received: by 2002:a54:4098:: with SMTP id i24mr846466oii.149.1582890133082; Fri, 28 Feb 2020 03:42:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582890133; cv=none; d=google.com; s=arc-20160816; b=dBtmO6kcAyymNiDtthcnR6UalKIrIVpmY6Di90bLa0wxqh+O8suVvVqsncigjga1n3 0jaLOVraBpkbfJA12n2JQAORehho2AO8g3pHMViusedlE6ME7QnmTrybS8C7XjjUxcgd SG/8TxKjyQFID6hx6GSFhQbOnfOPzVblusUk5IK2WIHVItOb6DWUI3A1Q5IEzCrvPyWx rCS2v0lp9SwcAsmdBxZiS59wz029p/pTrvAMcJhxjoWtj7TX+AfZo8IxVWT2fgm15d+G +xnaHRmV7O69XgugEKCbeDENu6y7iZkcOL/gkYanH8/9ETa/eBiDPWxShaBk9IxnwBlG U+rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=qgRBXu3UXujfUu/YLJD5NKUPvJ1HubicGzZMJLwxdxg=; b=ThmX/C2mIE+NVWDV0NQY+hlzVjdCoxeuWuqitq931NKKfYGhd34udaGmELJxBZpwkV wKFvjLFJuaCIDq5HZpc4ZrWznwpHnsOb5+9wZoTbdNAFraln1OlFQzTQGTVSC4IQRJ9X zquhqNcxROhu/8zZzXIbHP4fSM2b+O69MCxEY/qjGOVEbSDrT0tLO7XqMJCHNHgLMGJN o6LyAn2QairfI6/zy93Z4bZrt4Jf0xW3/sXfe6CRdUQeDWIETgBkbXptenX3WVbXLdE6 TbdsBm5SdsfGb1N4EjXXnPoYhP4Ns38KgSEur/Nbkh7W3k8qxKCf/hfYbjHavs9c/fO8 CRcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=IAEW3CVv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z1si1574449oix.12.2020.02.28.03.42.01; Fri, 28 Feb 2020 03:42:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=IAEW3CVv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726476AbgB1Ll4 (ORCPT + 99 others); Fri, 28 Feb 2020 06:41:56 -0500 Received: from mail-ua1-f68.google.com ([209.85.222.68]:39011 "EHLO mail-ua1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725730AbgB1Ll4 (ORCPT ); Fri, 28 Feb 2020 06:41:56 -0500 Received: by mail-ua1-f68.google.com with SMTP id c21so849651uam.6; Fri, 28 Feb 2020 03:41:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=qgRBXu3UXujfUu/YLJD5NKUPvJ1HubicGzZMJLwxdxg=; b=IAEW3CVv+KdBq/tsDmXVgbaGMpkVLw+nS6/uh+feLTX2l/1du9WV8lusAvjmcEmOIV bNu2OCsnBP45jQuDGoCKbt9l5pmQE8rHCL3QyU0kWtTKlSWNdfw8NzPLglFuHqGjA4of eWRId6NmuKmUVV4FBVpvpsKuH2jKQMyqVoYkZ792Gn63fWXY7177B2UB469VAukJ3/Yn zGHrRZBilpo6WHVZtm465Eth9XVfMRS/9d7NjqyIVBoKtXA9qvyAKaWaYw7isPvoHRNW jzU1nMB430hd4068R/xsTj59X4e47eyMJOsC3Vf51CwwRs+P8z7eqRL4NawHSJPXYN8Z yigg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=qgRBXu3UXujfUu/YLJD5NKUPvJ1HubicGzZMJLwxdxg=; b=CidnHKZXUjNIDdsJbKGsHViptlw2bO+921uqoo5JgE66zGNVPsveB3qRyROUH36O07 rjS+Qg4mD78O1dDIJ2m/rD9ricykbUlIRlethFE99VzKZea7/C0lm6o6dhwE7W8Bsb8f ys0yKNVNgdRCWTdjroJyDzRYLoPTi2KZg2G9x9yRAoGOEYBthgOXtD8j+EHHWRs2aSX6 /p5yc1R/2Wx6I+pEMYtdg4rwTgdTMMkHpv7kHiFB2DWMH5p32rvjHFiRQam3qvIdAVsa vQ2l5x4tPE+q/h2Jajl84PciNimbQTBNCKdsPmbsm6A4NXIMUDMlYVDDF2mYwBJ8YR9g 1G9A== X-Gm-Message-State: ANhLgQ2iXziaWLLLYnNCHOBbG75iZBgFvQJtAMXNwMCzUVAvK99IDRxe +UltbXMauKF8Q6Ur/AU+wa2jLZVN0r4urAY7qeDlzdOtsw4= X-Received: by 2002:a9f:3b02:: with SMTP id i2mr1670019uah.33.1582890115091; Fri, 28 Feb 2020 03:41:55 -0800 (PST) MIME-Version: 1.0 References: <20200228044518.20314-1-gmayyyha@gmail.com> In-Reply-To: From: Yanhu Cao Date: Fri, 28 Feb 2020 19:41:44 +0800 Message-ID: Subject: Re: [PATCH] ceph: using POOL FULL flag instead of OSDMAP FULL flag To: Ilya Dryomov Cc: Jeff Layton , Sage Weil , "David S. Miller" , kuba@kernel.org, Ceph Development , LKML , netdev Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Feb 28, 2020 at 6:23 PM Ilya Dryomov wrote: > > On Fri, Feb 28, 2020 at 5:45 AM Yanhu Cao wrote: > > > > OSDMAP_FULL and OSDMAP_NEARFULL are deprecated since mimic. > > > > Signed-off-by: Yanhu Cao > > --- > > fs/ceph/file.c | 6 ++++-- > > include/linux/ceph/osd_client.h | 2 ++ > > include/linux/ceph/osdmap.h | 3 ++- > > net/ceph/osd_client.c | 23 +++++++++++++---------- > > 4 files changed, 21 insertions(+), 13 deletions(-) > > > > diff --git a/fs/ceph/file.c b/fs/ceph/file.c > > index 7e0190b1f821..60ea1eed1b84 100644 > > --- a/fs/ceph/file.c > > +++ b/fs/ceph/file.c > > @@ -1482,7 +1482,8 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from) > > } > > > > /* FIXME: not complete since it doesn't account for being at quota */ > > - if (ceph_osdmap_flag(&fsc->client->osdc, CEPH_OSDMAP_FULL)) { > > + if (pool_flag(&fsc->client->osdc, ci->i_layout.pool_id, > > + CEPH_POOL_FLAG_FULL)) { > > err = -ENOSPC; > > goto out; > > } > > @@ -1575,7 +1576,8 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from) > > } > > > > if (written >= 0) { > > - if (ceph_osdmap_flag(&fsc->client->osdc, CEPH_OSDMAP_NEARFULL)) > > + if (pool_flag(&fsc->client->osdc, ci->i_layout.pool_id, > > + CEPH_POOL_FLAG_NEARFULL)) > > Hi Yanhu, > > Have you considered pre-mimic clusters here? They are still supported > (and will continue to be supported for the foreseeable future). > > Thanks, > > Ilya I have tested it work on Luminous, I think it work too since ceph-v0.80(https://github.com/ceph/ceph/blob/b78644e7dee100e48dfeca32c9270a6b210d3003/src/osd/osd_types.h#L815) alread have pool FLAG_FULL. CephFS doesn't write synchronously even if CEPH_OSDMAP_NEARFULL is used, then should fixed by CEPH_POOL_FLAG_NEARFULL.