diff options
author | Ilya Dryomov <idryomov@gmail.com> | 2018-05-17 10:13:07 -0400 |
---|---|---|
committer | Ilya Dryomov <idryomov@gmail.com> | 2018-06-04 14:45:58 -0400 |
commit | 29e878201ee635940ba018bce51f4ee0f0e47a5b (patch) | |
tree | bc501cab9a9a5231d946df3c4c49026d5e26c0e6 /net | |
parent | 4eea0fefd7e60552b36a74f49bd7064d1a5aef2d (diff) |
libceph: don't warn if req->r_abort_on_full is set
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 <idryomov@gmail.com>
Acked-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/ceph/osd_client.c | 10 |
1 files 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 @@ again: | |||
2239 | (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) || | 2239 | (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) || |
2240 | pool_full(osdc, req->r_t.base_oloc.pool))) { | 2240 | pool_full(osdc, req->r_t.base_oloc.pool))) { |
2241 | dout("req %p full/pool_full\n", req); | 2241 | dout("req %p full/pool_full\n", req); |
2242 | pr_warn_ratelimited("FULL or reached pool quota\n"); | 2242 | if (req->r_abort_on_full) { |
2243 | req->r_t.paused = true; | ||
2244 | maybe_request_map(osdc); | ||
2245 | if (req->r_abort_on_full) | ||
2246 | err = -ENOSPC; | 2243 | err = -ENOSPC; |
2244 | } else { | ||
2245 | pr_warn_ratelimited("FULL or reached pool quota\n"); | ||
2246 | req->r_t.paused = true; | ||
2247 | maybe_request_map(osdc); | ||
2248 | } | ||
2247 | } else if (!osd_homeless(osd)) { | 2249 | } else if (!osd_homeless(osd)) { |
2248 | need_send = true; | 2250 | need_send = true; |
2249 | } else { | 2251 | } else { |