On 08/29, Verma, Vishal L wrote: > On Wed, 2019-08-28 at 19:34 -0700, Dan Williams wrote: > > > > Hmm, should "--continue --force" override that policy? > > Yep that's a good idea, with a big note in the man page that errors > could be lost/meaningless in that case. > > > > > Otherwise this looks good to me. > > Thanks, I'll send a new version with the above. > _______________________________________________
Here is v2 with the --force change: 3<---- >From a91425beabae750227931594f77fe3db72b4cfff Mon Sep 17 00:00:00 2001 From: Vishal Verma <vishal.l.ve...@intel.com> Date: Wed, 28 Aug 2019 18:01:38 -0600 Subject: [ndctl PATCH v2] ndctl/namespace: add a --continue option to create namespaces greedily Add a --continue option to ndctl-create-namespaces to allow the creation of as many namespaces as possible, that meet the given filter restrictions. The creation loop will be aborted if a failure is encountered at any point, unless --force is also specified. Link: https://github.com/pmem/ndctl/issues/106 Reported-by: Steve Scargal <steve.scarg...@intel.com> Cc: Jeff Moyer <jmo...@redhat.com> Cc: Dan Williams <dan.j.willi...@intel.com> Signed-off-by: Vishal Verma <vishal.l.ve...@intel.com> --- v2: Allow --force to continue in spite of errors (Dan) .../ndctl/ndctl-create-namespace.txt | 11 +++++- ndctl/namespace.c | 34 +++++++++++++++---- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/Documentation/ndctl/ndctl-create-namespace.txt b/Documentation/ndctl/ndctl-create-namespace.txt index c9ae27c..e29a5e7 100644 --- a/Documentation/ndctl/ndctl-create-namespace.txt +++ b/Documentation/ndctl/ndctl-create-namespace.txt @@ -152,6 +152,13 @@ OPTIONS namespace directly ("--map=dev"). The overhead is 64-bytes per 4K (16GB per 1TB) on x86. +-c:: +--continue:: + Do not stop after creating one namespace. Instead, greedily create as + many namespaces as possible within the given --bus and --region filter + restrictions. This will abort if any creation attempt results in an + error unless --force is also supplied. + -f:: --force:: Unless this option is specified the 'reconfigure namespace' @@ -160,7 +167,9 @@ OPTIONS the operation is attempted. However, if the namespace is mounted then the 'disable namespace' and 'reconfigure namespace' operations will be aborted. The namespace must be - unmounted before being reconfigured. + unmounted before being reconfigured. When used in conjunction + with --continue, continue the namespace creation loop even + if an error is encountered for intermediate namespaces. -L:: --autolabel:: diff --git a/ndctl/namespace.c b/ndctl/namespace.c index af20a42..67768f3 100644 --- a/ndctl/namespace.c +++ b/ndctl/namespace.c @@ -41,6 +41,7 @@ static struct parameters { bool do_scan; bool mode_default; bool autolabel; + bool greedy; const char *bus; const char *map; const char *type; @@ -114,7 +115,9 @@ OPT_STRING('t', "type", ¶m.type, "type", \ OPT_STRING('a', "align", ¶m.align, "align", \ "specify the namespace alignment in bytes (default: 2M)"), \ OPT_BOOLEAN('f', "force", &force, "reconfigure namespace even if currently active"), \ -OPT_BOOLEAN('L', "autolabel", ¶m.autolabel, "automatically initialize labels") +OPT_BOOLEAN('L', "autolabel", ¶m.autolabel, "automatically initialize labels"), \ +OPT_BOOLEAN('c', "continue", ¶m.greedy, \ + "continue creating namespaces as long as the filter criteria are met") #define CHECK_OPTIONS() \ OPT_BOOLEAN('R', "repair", &repair, "perform metadata repairs"), \ @@ -1322,10 +1325,10 @@ static int do_xaction_namespace(const char *namespace, int *processed) { struct ndctl_namespace *ndns, *_n; + int rc = -ENXIO, saved_rc = 0; struct ndctl_region *region; const char *ndns_name; struct ndctl_bus *bus; - int rc = -ENXIO; *processed = 0; @@ -1365,8 +1368,16 @@ static int do_xaction_namespace(const char *namespace, rc = namespace_create(region); if (rc == -EAGAIN) continue; - if (rc == 0) - *processed = 1; + if (rc == 0) { + (*processed)++; + if (param.greedy) + continue; + } + if (force) { + if (rc) + saved_rc = rc; + continue; + } return rc; } ndctl_namespace_foreach_safe(region, ndns, _n) { @@ -1427,10 +1438,18 @@ static int do_xaction_namespace(const char *namespace, /* * Namespace creation searched through all candidate * regions and all of them said "nope, I don't have - * enough capacity", so report -ENOSPC + * enough capacity", so report -ENOSPC. Except during + * greedy namespace creation using --continue as we + * may have created some namespaces already, and the + * last one in the region search may preexist. */ - rc = -ENOSPC; + if (param.greedy && (*processed) > 0) + rc = 0; + else + rc = -ENOSPC; } + if (saved_rc) + rc = saved_rc; return rc; } @@ -1487,6 +1506,9 @@ int cmd_create_namespace(int argc, const char **argv, struct ndctl_ctx *ctx) rc = do_xaction_namespace(NULL, ACTION_CREATE, ctx, &created); } + if (param.greedy) + fprintf(stderr, "created %d namespace%s\n", created, + created == 1 ? "" : "s"); if (rc < 0 || (!namespace && created < 1)) { fprintf(stderr, "failed to %s namespace: %s\n", namespace ? "reconfigure" : "create", strerror(-rc)); -- 2.20.1 _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
