LU-8913 nodemap: fix nodemap range format '*@<net>' support

In cfs_ip_min_max(), (nidrange->nr_all == 1) means this nid range
is a full IP address range(*.*.*.*). In this case, we don't need
to compare it to any other nid range, but set min_nid to 0.0.0.0
and max_nid to 255.255.255.255 directly.

Also, test_10d is added to sanity-sec.sh to verify this patch and
some code cleanup is done for jt_nodemap_add/del_range().

Change minimum MGS version to 2.10.1

Lustre-change: https://review.whamcloud.com/31684
Lustre-commit: 230266326f49b0e6aab43c1d1a5c926d78c11e53

Change-Id: I72c546b060f9e123204a566a3bd373b4f017502d
Signed-off-by: Emoly Liu <emoly.liu@intel.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Signed-off-by: Minh Diep <minh.diep@intel.com>
Reviewed-on: https://review.whamcloud.com/31950
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>

diff --git a/libcfs/libcfs/util/nidstrings.c b/libcfs/libcfs/util/nidstrings.c
index c8aef34..4c320c8 100644 (file)
--- a/libcfs/libcfs/util/nidstrings.c
+++ b/libcfs/libcfs/util/nidstrings.c
@@ -1201,6 +1201,12 @@ static int cfs_ip_min_max(struct list_head *nidlist, __u32 *min_nid,
                if (nidlist_count > 0)
                        return -EINVAL;
 
+               if (nr->nr_all) {
+                       min_ip_addr = 0;
+                       max_ip_addr = 0xffffffff;
+                       break;
+               }
+
                list_for_each_entry(ar, &nr->nr_addrranges, ar_link) {
                        rc = cfs_ip_ar_min_max(ar, &tmp_min_ip_addr,
                                               &tmp_max_ip_addr);

diff --git a/lnet/lnet/nidstrings.c b/lnet/lnet/nidstrings.c
index c18d7d7..5122a2e 100644 (file)
--- a/lnet/lnet/nidstrings.c
+++ b/lnet/lnet/nidstrings.c
@@ -672,6 +672,12 @@ static int cfs_ip_min_max(struct list_head *nidlist, __u32 *min_nid,
                if (nidlist_count > 0)
                        return -EINVAL;
 
+               if (nr->nr_all) {
+                       min_ip_addr = 0;
+                       max_ip_addr = 0xffffffff;
+                       break;
+               }
+
                list_for_each_entry(ar, &nr->nr_addrranges, ar_link) {
                        rc = cfs_ip_ar_min_max(ar, &tmp_min_ip_addr,
                                               &tmp_max_ip_addr);

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
index 9d81a27..c61fd3d 100755 (executable)
--- a/lustre/tests/sanity-sec.sh
+++ b/lustre/tests/sanity-sec.sh
@@ -338,8 +338,8 @@ add_idmaps() {
 }
 
 update_idmaps() { #LU-10040
-       [ $(lustre_version_code mgs) -lt $(version_code 2.10.55) ] &&
-               skip "Need MGS >= 2.10.55" &&
+       [ $(lustre_version_code mgs) -lt $(version_code 2.10.1) ] &&
+               skip "Need MGS >= 2.10.1" &&
                return
        local csum=${HOSTNAME_CHECKSUM}_0
        local old_id_client=$ID0
@@ -751,8 +751,8 @@ test_10a() {
 run_test 10a "nodemap reject duplicate ranges"
 
 test_10b() {
-       [ $(lustre_version_code mgs) -lt $(version_code 2.10.53) ] &&
-               skip "Need MGS >= 2.10.53" && return
+       [ $(lustre_version_code mgs) -lt $(version_code 2.10.1) ] &&
+               skip "Need MGS >= 2.10.1" && return
 
        local nm1="nodemap1"
        local nm2="nodemap2"
@@ -779,8 +779,8 @@ test_10b() {
 run_test 10b "delete range from the correct nodemap"
 
 test_10c() { #LU-8912
-       [ $(lustre_version_code mgs) -lt $(version_code 2.10.57) ] &&
-               skip "Need MGS >= 2.10.57" && return
+       [ $(lustre_version_code mgs) -lt $(version_code 2.10.1) ] &&
+               skip "Need MGS >= 2.10.1" && return
 
        local nm="nodemap_lu8912"
        local nid_range="10.210.[32-47].[0-255]@o2ib3"
@@ -808,6 +808,36 @@ test_10c() { #LU-8912
 }
 run_test 10c "verfify contiguous range support"
 
+test_10d() { #LU-8913
+       [ $(lustre_version_code mgs) -lt $(version_code 2.10.3) ] &&
+               skip "Need MGS >= 2.10.3" && return
+
+       local nm="nodemap_lu8913"
+       local nid_range="*@o2ib3"
+       local start_nid="0.0.0.0@o2ib3"
+       local end_nid="255.255.255.255@o2ib3"
+       local start_nid_found
+       local end_nid_found
+
+       do_facet mgs $LCTL nodemap_del $nm 2>/dev/null
+       do_facet mgs $LCTL nodemap_add $nm || error "Add $nm failed"
+       do_facet mgs $LCTL nodemap_add_range --name $nm --range $nid_range ||
+               error "Add range $nid_range to $nm failed"
+
+       start_nid_found=$(do_facet mgs $LCTL get_param nodemap.$nm.* |
+               awk -F '[,: ]' /start_nid/'{ print $9 }')
+       [ "$start_nid" == "$start_nid_found" ] ||
+               error "start_nid: $start_nid_found != $start_nid"
+       end_nid_found=$(do_facet mgs $LCTL get_param nodemap.$nm.* |
+               awk -F '[,: ]' /end_nid/'{ print $13 }')
+       [ "$end_nid" == "$end_nid_found" ] ||
+               error "end_nid: $end_nid_found != $end_nid"
+
+       do_facet mgs $LCTL nodemap_del $nm || error "Delete $nm failed"
+       return 0
+}
+run_test 10d "verfify nodemap range format '*@<net>' support"
+
 test_11() {
        local rc
 
@@ -1724,8 +1754,8 @@ run_test 23a "test mapped regular ACLs"
 
 test_23b() { #LU-9929
        remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-       [ $(lustre_version_code mgs) -lt $(version_code 2.10.53) ] &&
-               skip "Need MGS >= 2.10.53" && return
+       [ $(lustre_version_code mgs) -lt $(version_code 2.10.1) ] &&
+               skip "Need MGS >= 2.10.1" && return
 
        nodemap_test_setup
        trap nodemap_test_cleanup EXIT

diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c
index cbfcbac..0492046 100644 (file)
--- a/lustre/utils/obd.c
+++ b/lustre/utils/obd.c
@@ -3433,6 +3433,51 @@ int jt_nodemap_test_id(int argc, char **argv)
 }
 
 /**
+ * parse nid range
+ *
+ * \param      nodemap_range   --range string
+ * \param      nid_range       nid range string, min_nid:max_nid
+ *
+ * \retval                     0 on success
+ */
+static int parse_nid_range(char *nodemap_range, char *nid_range, int range_len)
+{
+       char                    min_nid[LNET_NIDSTR_SIZE + 1];
+       char                    max_nid[LNET_NIDSTR_SIZE + 1];
+       struct list_head        nidlist;
+       int                     rc = 0;
+
+       INIT_LIST_HEAD(&nidlist);
+
+       if (cfs_parse_nidlist(nodemap_range, strlen(nodemap_range),
+                             &nidlist) <= 0) {
+               fprintf(stderr,
+                       "error: nodemap_xxx_range: can't parse nid range: %s\n",
+                       nodemap_range);
+               return -1;
+       }
+
+       rc = cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0],
+                                      LNET_NIDSTR_SIZE);
+       if (rc < 0) {
+               if (rc == -EINVAL)
+                       fprintf(stderr,
+                               "error: nodemap_xxx_range: nid range uses "
+                               "currently unsupported features\n");
+               else if (rc == -ERANGE)
+                       fprintf(stderr,
+                               "error: nodemap_xxx_range: nodemap ranges must "
+                               "be contiguous\n");
+
+               return rc;
+       }
+
+       snprintf(nid_range, range_len, "%s:%s", min_nid, max_nid);
+
+       return rc;
+}
+
+/**
  * add an nid range to a nodemap
  *
  * \param      argc            number of args
@@ -3447,9 +3492,6 @@ int jt_nodemap_add_range(int argc, char **argv)
 {
        char                    *nodemap_name = NULL;
        char                    *nodemap_range = NULL;
-       struct list_head        nidlist;
-       char                    min_nid[LNET_NIDSTR_SIZE + 1];
-       char                    max_nid[LNET_NIDSTR_SIZE + 1];
        char                    nid_range[2 * LNET_NIDSTR_SIZE + 2];
        int                     rc = 0;
        int                     c;
@@ -3472,8 +3514,6 @@ int jt_nodemap_add_range(int argc, char **argv)
                }
        };
 
-       INIT_LIST_HEAD(&nidlist);
-
        while ((c = getopt_long(argc, argv, "n:r:",
                                long_options, NULL)) != -1) {
                switch (c) {
@@ -3492,30 +3532,11 @@ int jt_nodemap_add_range(int argc, char **argv)
                return -1;
        }
 
-       if (cfs_parse_nidlist(nodemap_range, strlen(nodemap_range),
-                             &nidlist) <= 0) {
-               fprintf(stderr, "error: %s: can't parse nid range: %s\n",
-                       jt_cmdname(argv[0]), nodemap_range);
-               return -1;
-       }
-
-       rc = cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0],
-                                      LNET_NIDSTR_SIZE);
-       if (rc < 0) {
+       rc = parse_nid_range(nodemap_range, nid_range, sizeof(nid_range));
+       if (rc) {
                errno = -rc;
-               if (rc == -EINVAL)
-                       fprintf(stderr, "error: %s: nid range uses "
-                               "currently unsupported features\n",
-                               jt_cmdname(argv[0]));
-               else if (rc == -ERANGE)
-                       fprintf(stderr, "error: %s: nodemap ranges must be "
-                               "contiguous\n", jt_cmdname(argv[0]));
-
                return rc;
        }
-
-       snprintf(nid_range, sizeof(nid_range), "%s:%s", min_nid, max_nid);
-
        rc = nodemap_cmd(LCFG_NODEMAP_ADD_RANGE, NULL, 0, argv[0],
                         nodemap_name, nid_range, NULL);
        if (rc != 0) {
@@ -3543,9 +3564,6 @@ int jt_nodemap_del_range(int argc, char **argv)
 {
        char                    *nodemap_name = NULL;
        char                    *nodemap_range = NULL;
-       struct list_head        nidlist;
-       char                    min_nid[LNET_NIDSTR_SIZE + 1];
-       char                    max_nid[LNET_NIDSTR_SIZE + 1];
        char                    nid_range[2 * LNET_NIDSTR_SIZE + 2];
        int                     rc = 0;
        int                     c;
@@ -3568,8 +3586,6 @@ int jt_nodemap_del_range(int argc, char **argv)
                }
        };
 
-       INIT_LIST_HEAD(&nidlist);
-
        while ((c = getopt_long(argc, argv, "n:r:",
                                long_options, NULL)) != -1) {
                switch (c) {
@@ -3588,30 +3604,11 @@ int jt_nodemap_del_range(int argc, char **argv)
                return -1;
        }
 
-       if (cfs_parse_nidlist(nodemap_range, strlen(nodemap_range),
-                             &nidlist) <= 0) {
-               fprintf(stderr, "error: %s: can't parse nid range: %s\n",
-                       jt_cmdname(argv[0]), nodemap_range);
-               return -1;
-       }
-
-       rc = cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0],
-                                      LNET_NIDSTR_SIZE);
-       if (rc < 0) {
+       rc = parse_nid_range(nodemap_range, nid_range, sizeof(nid_range));
+       if (rc) {
                errno = -rc;
-               if (rc == -EINVAL)
-                       fprintf(stderr, "error: %s: nid range uses "
-                               "currently unsupported features\n",
-                               jt_cmdname(argv[0]));
-               else if (rc == -ERANGE)
-                       fprintf(stderr, "error: %s: nodemap ranges must be "
-                               "contiguous\n", jt_cmdname(argv[0]));
-
                return rc;
        }
-
-       snprintf(nid_range, sizeof(nid_range), "%s:%s", min_nid, max_nid);
-
        rc = nodemap_cmd(LCFG_NODEMAP_DEL_RANGE, NULL, 0, argv[0],
                         nodemap_name, nid_range, NULL);
        if (rc != 0) {