From patchwork Wed May 30 17:43:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 10439481 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E3EBB60327 for ; Wed, 30 May 2018 17:44:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D174D289F1 for ; Wed, 30 May 2018 17:44:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C4AED28A4A; Wed, 30 May 2018 17:44:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 754E2289F1 for ; Wed, 30 May 2018 17:44:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932155AbeE3RoB (ORCPT ); Wed, 30 May 2018 13:44:01 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:37716 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932145AbeE3Rn4 (ORCPT ); Wed, 30 May 2018 13:43:56 -0400 Received: by mail-wm0-f65.google.com with SMTP id l1-v6so49392474wmb.2 for ; Wed, 30 May 2018 10:43:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6AP5N6fjUP5efWMv6FPqh3F1k3Dj0Ylg52CxRsdlZGU=; b=solrA4Zdj/63im1YTdcwDR/gBK9q4xHZYPcwQP2N+e9vNdOa/MQx8h7V/JggOdHw4w PRi2ttXVIKtdCB/KRqaaZZ0WpAtb0qV51EQj9xCJiB9uyhUYFwVSJE4XvAl797BId5ql HMHiLlHhCQny3UoHBH7q8O4o3t3J4uDsFBlxLGxAG35I0txrYn6vVauuf18TLB96YAN/ uBfqCRQDLEQ1h0rLmT+ofQd0+FeG1nErpThEHyuziR0JjAr3X9Of37mgSXLqrYd+T7nV dN98FDD1R9RGG9uWI5Wnq/TWYpozPWROsKKufzvrgyDICDltQ992PVhyN+PP357q8Wod qDvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6AP5N6fjUP5efWMv6FPqh3F1k3Dj0Ylg52CxRsdlZGU=; b=SB2fmNU9WiLIe87LLRjPSiD+Du1Ea5X4aIA+EczvbitzvZfkuJlcGEux8b32Tcx0Ey cHm7E4omlxaJCwbUorna0B6NCsqcF2MyK7YXQtEUSdo8XH2+6rNSWg7eXNBg1lZLw9rH eRB0mnJ4pwfRGBu6s4VedDJeVRwpQ4H9PxlZXpT1hU5QyRwKS0Eos/uaWH8YFVFllBTl 2btVzVAEL2Z5Zpn5RvUuKgQFHlFV4zf2vFyZLXSDh9vzRRXI49wo+bvkektDp07uUZVR 7EyWsmlcusGvTbKVwmsE/KBcz+GZbB1RHPcffT5ckFXieqKGJTQ4oRMA8h/RaUPG00UB 5lKA== X-Gm-Message-State: ALKqPwciBenmFR01e2nfikK2QcJ/ap10wysNXcNqK+8W8rnsyMMXUzTF xzymljFsy0CGe8/ZHyEmtWzat9Dw X-Google-Smtp-Source: ADUXVKJMaLtC7Yyc9EdoTOLLcs7Ok2YViZnIcAZgvtDdPM2m46Qd3a40TZysXnPplNx+dcoM2vQ7bQ== X-Received: by 2002:a1c:4a0a:: with SMTP id x10-v6mr2035375wma.91.1527702234690; Wed, 30 May 2018 10:43:54 -0700 (PDT) Received: from orange.brq.redhat.com. (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id p3-v6sm18647658wrn.31.2018.05.30.10.43.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 May 2018 10:43:54 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Cc: Jeff Layton Subject: [PATCH 4/7] libceph: don't warn if req->r_abort_on_full is set Date: Wed, 30 May 2018 19:43:39 +0200 Message-Id: <1527702222-8232-5-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1527702222-8232-1-git-send-email-idryomov@gmail.com> References: <1527702222-8232-1-git-send-email-idryomov@gmail.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The "FULL or reached pool quota" warning is there to explain paused requests. No need to emit it if pausing isn't going to occur. Signed-off-by: Ilya Dryomov --- net/ceph/osd_client.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index be274ab43d01..34b5334548c3 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -2239,11 +2239,13 @@ static void __submit_request(struct ceph_osd_request *req, bool wrlocked) (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) || pool_full(osdc, req->r_t.base_oloc.pool))) { dout("req %p full/pool_full\n", req); - pr_warn_ratelimited("FULL or reached pool quota\n"); - req->r_t.paused = true; - maybe_request_map(osdc); - if (req->r_abort_on_full) + if (req->r_abort_on_full) { err = -ENOSPC; + } else { + pr_warn_ratelimited("FULL or reached pool quota\n"); + req->r_t.paused = true; + maybe_request_map(osdc); + } } else if (!osd_homeless(osd)) { need_send = true; } else {