[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ceph-devel
Subject:    Re: [PATCH v4] libceph: introduce new option abort_on_full
From:       Dongsheng Yang <dongsheng.yang () easystack ! cn>
Date:       2018-12-21 5:25:41
Message-ID: 5C1C7955.6050306 () easystack ! cn
[Download RAW message or body]



On 12/21/2018 04:04 AM, Ilya Dryomov wrote:
> On Tue, Dec 18, 2018 at 10:32 AM Dongsheng Yang
> <dongsheng.yang@easystack.cn> wrote:
>> Introduce a new option abort_on_full, default to false. Then
>> we can get -ENOSPC when the pool is full, or reaches quota.
>>
>> Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
>> ---
>>   fs/ceph/super.c                 | 2 +-
>>   include/linux/ceph/libceph.h    | 3 ++-
>>   include/linux/ceph/osd_client.h | 1 -
>>   net/ceph/ceph_common.c          | 8 ++++++++
>>   net/ceph/osd_client.c           | 4 ++--
>>   5 files changed, 13 insertions(+), 5 deletions(-)
>>
>> diff --git a/fs/ceph/super.c b/fs/ceph/super.c
>> index b5ecd6f..69ad691 100644
>> --- a/fs/ceph/super.c
>> +++ b/fs/ceph/super.c
>> @@ -640,7 +640,7 @@ static struct ceph_fs_client *create_fs_client(struct ceph_mount_options *fsopt,
>>          opt = NULL; /* fsc->client now owns this */
>>
>>          fsc->client->extra_mon_dispatch = extra_mon_dispatch;
>> -       fsc->client->osdc.abort_on_full = true;
>> +       ceph_set_opt(fsc->client, ABORT_ON_FULL);
>>
>>          if (!fsopt->mds_namespace) {
>>                  ceph_monc_want_map(&fsc->client->monc, CEPH_SUB_MDSMAP,
>> diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
>> index 68bb09c..9c48446 100644
>> --- a/include/linux/ceph/libceph.h
>> +++ b/include/linux/ceph/libceph.h
>> @@ -35,6 +35,7 @@
>>   #define CEPH_OPT_NOMSGAUTH       (1<<4) /* don't require msg signing feat */
>>   #define CEPH_OPT_TCP_NODELAY     (1<<5) /* TCP_NODELAY on TCP sockets */
>>   #define CEPH_OPT_NOMSGSIGN       (1<<6) /* don't sign msgs */
>> +#define CEPH_OPT_ABORT_ON_FULL   (1<<7) /* abort request with -ENOSPC when pool is full */
>>
>>   #define CEPH_OPT_DEFAULT   (CEPH_OPT_TCP_NODELAY)
>>
>> @@ -53,7 +54,7 @@ struct ceph_options {
>>          unsigned long osd_request_timeout;      /* jiffies */
>>
>>          /*
>> -        * any type that can't be simply compared or doesn't need need
>> +        * any type that can't be simply compared or doesn't need
>>           * to be compared should go beyond this point,
>>           * ceph_compare_options() should be updated accordingly
>>           */
>> diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
>> index 7a2af50..2294f96 100644
>> --- a/include/linux/ceph/osd_client.h
>> +++ b/include/linux/ceph/osd_client.h
>> @@ -354,7 +354,6 @@ struct ceph_osd_client {
>>          struct rb_root         linger_map_checks;
>>          atomic_t               num_requests;
>>          atomic_t               num_homeless;
>> -       bool                   abort_on_full; /* abort w/ ENOSPC when full */
>>          int                    abort_err;
>>          struct delayed_work    timeout_work;
>>          struct delayed_work    osds_timeout_work;
>> diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
>> index 87afb9e..e786ae8 100644
>> --- a/net/ceph/ceph_common.c
>> +++ b/net/ceph/ceph_common.c
>> @@ -255,6 +255,7 @@ enum {
>>          Opt_nocephx_sign_messages,
>>          Opt_tcp_nodelay,
>>          Opt_notcp_nodelay,
>> +       Opt_abort_on_full,
>>   };
>>
>>   static match_table_t opt_tokens = {
>> @@ -280,6 +281,7 @@ enum {
>>          {Opt_nocephx_sign_messages, "nocephx_sign_messages"},
>>          {Opt_tcp_nodelay, "tcp_nodelay"},
>>          {Opt_notcp_nodelay, "notcp_nodelay"},
>> +       {Opt_abort_on_full, "abort_on_full"},
>>          {-1, NULL}
>>   };
>>
>> @@ -535,6 +537,10 @@ struct ceph_options *
>>                          opt->flags &= ~CEPH_OPT_TCP_NODELAY;
>>                          break;
>>
>> +               case Opt_abort_on_full:
>> +                       opt->flags |= CEPH_OPT_ABORT_ON_FULL;
>> +                       break;
>> +
>>                  default:
>>                          BUG_ON(token);
>>                  }
>> @@ -574,6 +580,8 @@ int ceph_print_client_options(struct seq_file *m, struct ceph_client *client)
>>                  seq_puts(m, "nocephx_sign_messages,");
>>          if ((opt->flags & CEPH_OPT_TCP_NODELAY) == 0)
>>                  seq_puts(m, "notcp_nodelay,");
>> +       if (opt->flags & CEPH_OPT_ABORT_ON_FULL)
>> +               seq_puts(m, "abort_on_full,");
>>
>>          if (opt->mount_timeout != CEPH_MOUNT_TIMEOUT_DEFAULT)
>>                  seq_printf(m, "mount_timeout=%d,",
>> diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
>> index d23a9f8..fa9530d 100644
>> --- a/net/ceph/osd_client.c
>> +++ b/net/ceph/osd_client.c
>> @@ -2315,7 +2315,7 @@ 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);
>> -               if (osdc->abort_on_full) {
>> +               if (ceph_test_opt(osdc->client, ABORT_ON_FULL)) {
>>                          err = -ENOSPC;
>>                  } else {
>>                          pr_warn_ratelimited("FULL or reached pool quota\n");
>> @@ -2545,7 +2545,7 @@ static void ceph_osdc_abort_on_full(struct ceph_osd_client *osdc)
>>   {
>>          bool victims = false;
>>
>> -       if (osdc->abort_on_full &&
>> +       if (ceph_test_opt(osdc->client, ABORT_ON_FULL) &&
>>              (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) || have_pool_full(osdc)))
>>                  for_each_request(osdc, abort_on_full_fn, &victims);
>>   }
> Looks good, except we probably don't want "abort_on_full" in "mount"
> output for the filesystem (it can't be disabled after all).  I'll see
> if I can fix that and apply the patch tomorrow.

okey thanx
>
> Thanks,
>
>                  Ilya
>


[prev in list] [next in list] [prev in thread] [next in thread]