LU-3445 utils: make add_param() handle comma-separated values

Current mkfs.lustre supports comma-separated values in "--mgsnode",
"--failnode", etc. options. However, in mount.lustre, the values
are directly passed to mount() as options without prefixing with
Lustre parameter key for each one. This will make the values can
not be recognized by the backend filesystem and cause mount.lustre
fail with -EINVAL error.

This patch improves add_param() to extract values from the comma-
separated string and prefix Lustre parameter key to each value.

Signed-off-by: Jian Yu <jian.yu@intel.com>
Change-Id: I64c5cb6f61277a93f65f69f63050721e0070c450
Reviewed-on: http://review.whamcloud.com/6686
Reviewed-by: Bobi Jam <bobijam@gmail.com>
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Niu Yawei <yawei.niu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 0a7b06f..cf8e3d4 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -4262,6 +4262,47 @@ test_76() {
 }
 run_test 76 "set permanent params set_param -P"
 
 }
 run_test 76 "set permanent params set_param -P"
 

+test_77() { # LU-3445
+       local server_version=$(lustre_version_code $SINGLEMDS)
+
+       [[ $server_version -ge $(version_code 2.2.60) ]] &&
+       [[ $server_version -le $(version_code 2.4.0) ]] &&
+               skip "Need MDS version < 2.2.60 or > 2.4.0" && return
+
+       if [[ -z "$fs2ost_DEV" || -z "$fs2mds_DEV" ]]; then
+               is_blkdev $SINGLEMDS $(mdsdevname ${SINGLEMDS//mds/}) &&
+               skip_env "mixed loopback and real device not working" && return
+       fi
+
+       local fs2mdsdev=$(mdsdevname 1_2)
+       local fs2ostdev=$(ostdevname 1_2)
+       local fs2mdsvdev=$(mdsvdevname 1_2)
+       local fs2ostvdev=$(ostvdevname 1_2)
+       local fsname=test1234
+       local mgsnid
+       local failnid="$(h2$NETTYPE 1.2.3.4),$(h2$NETTYPE 4.3.2.1)"
+
+       add fs2mds $(mkfs_opts mds1 $fs2mdsdev) --mgs --fsname=$fsname \
+               --reformat $fs2mdsdev $fs2mdsvdev || error "add fs2mds failed"
+       start fs2mds $fs2mdsdev $MDS_MOUNT_OPTS && trap cleanup_24a EXIT INT ||
+               error "start fs2mds failed"
+
+       mgsnid=$(do_facet fs2mds $LCTL list_nids | xargs | tr ' ' ,)
+       [[ $mgsnid = *,* ]] || mgsnid+=",$mgsnid"
+
+       add fs2ost $(mkfs_opts ost1 $fs2ostdev) --mgsnode=$mgsnid \
+               --failnode=$failnid --fsname=$fsname \
+               --reformat $fs2ostdev $fs2ostvdev ||
+                       error "add fs2ost failed"
+       start fs2ost $fs2ostdev $OST_MOUNT_OPTS || error "start fs2ost failed"
+
+       mkdir -p $MOUNT2
+       mount -t lustre $mgsnid:/$fsname $MOUNT2 || error "mount $MOUNT2 failed"
+       DIR=$MOUNT2 MOUNT=$MOUNT2 check_mount || error "check $MOUNT2 failed"
+       cleanup_24a
+}
+run_test 77 "comma-separated MGS NIDs and failover node NIDs"
+

 if ! combined_mgs_mds ; then
        stop mgs
 fi
 if ! combined_mgs_mds ; then
        stop mgs
 fi

diff --git a/lustre/utils/mount_utils.c b/lustre/utils/mount_utils.c
index 80fc189..e0502fe 100644 (file)
--- a/lustre/utils/mount_utils.c
+++ b/lustre/utils/mount_utils.c
@@ -102,19 +102,31 @@ int run_command(char *cmd, int cmdsz)
 
 int add_param(char *buf, char *key, char *val)
 {
 
 int add_param(char *buf, char *key, char *val)
 {

-       int end = sizeof(((struct lustre_disk_data *)0)->ldd_params);
-       int start = strlen(buf);
-       int keylen = 0;
+       char *sub_val = NULL;
+       int   buflen = strlen(buf);
+       int   end = sizeof(((struct lustre_disk_data *)0)->ldd_params);
+       int   start = 0;
+       int   keylen = 0;

 
 

-       if (key)
+       if (key != NULL)

                keylen = strlen(key);
                keylen = strlen(key);

-       if (start + 1 + keylen + strlen(val) >= end) {
-               fprintf(stderr, "%s: params are too long-\n%s %s%s\n",
-                       progname, buf, key ? key : "", val);
-               return 1;
+
+       start = buflen;
+       while ((sub_val = strsep(&val, ",")) != NULL) {
+               if (*sub_val == 0)
+                       continue;
+
+               if (start + 1 + keylen + strlen(sub_val) >= end) {
+                       fprintf(stderr, "%s: params are too long-\n%s %s%s\n",
+                               progname, buf, key != NULL ? key : "", sub_val);
+                       buf[buflen] = '\0';
+                       return 1;
+               }
+
+               sprintf(buf + start, " %s%s", key != NULL ? key : "", sub_val);
+               start = strlen(buf);

        }
 
        }
 

-       sprintf(buf + start, " %s%s", key ? key : "", val);

        return 0;
 }
 
        return 0;
 }