libcfs_net2str(refnet));
ptlrpc_conn = ptlrpc_uuid_to_connection(uuid, refnet);
- if (!ptlrpc_conn) {
- CDEBUG(D_HA, "can't find connection %s\n", uuid->uuid);
- RETURN(-ENOENT);
+ if (IS_ERR(ptlrpc_conn)) {
+ CDEBUG(D_HA, "can't find connection %s: rc=%ld\n",
+ uuid->uuid, PTR_ERR(ptlrpc_conn));
+ RETURN(PTR_ERR(ptlrpc_conn));
}
if (create) {
int rc;
ptlrpc_conn = ptlrpc_uuid_to_connection(uuid, LNET_NID_NET(prim_nid));
- if (!ptlrpc_conn) {
+ if (IS_ERR(ptlrpc_conn)) {
const char *str_uuid = obd_uuid2str(uuid);
rc = class_add_uuid(str_uuid, prim_nid);
* [3]: inactive-on-startup
* [4]: restrictive net
*/
- if (cfg && cfg->cfg_sb && s2lsi(cfg->cfg_sb) &&
- !IS_SERVER(s2lsi(cfg->cfg_sb))) {
+ if (cfg && cfg->cfg_sb && s2lsi(cfg->cfg_sb)) {
struct lustre_sb_info *lsi = s2lsi(cfg->cfg_sb);
char *nidnet = lsi->lsi_lmd->lmd_nidnet;
if (lcfg->lcfg_command == LCFG_SETUP &&
lcfg->lcfg_bufcount != 2 && nidnet) {
- CDEBUG(D_CONFIG, "Adding net %s info to setup "
- "command for client %s\n", nidnet,
- lustre_cfg_string(lcfg, 0));
+ CDEBUG(D_CONFIG,
+ "Adding net %s info to setup command for client %s\n",
+ nidnet, lustre_cfg_string(lcfg, 0));
lustre_cfg_bufs_set_string(&bufs, 4, nidnet);
}
}
/* Start the MGC */
rc = lustre_start_simple(mgcname, LUSTRE_MGC_NAME,
(char *)uuid->uuid, LUSTRE_MGS_OBDNAME,
- niduuid, NULL, NULL);
+ niduuid, NULL, lsi->lsi_lmd->lmd_nidnet);
if (rc)
GOTO(out_free, rc);
GOTO(invalid, rc = -ENOMEM);
strncat(lmd->lmd_fileset, s1, s2 - s1 + 1);
}
- } else {
- /* server mount */
- if (lmd->lmd_nidnet != NULL) {
- /* 'network=' mount option forbidden for server */
- OBD_FREE(lmd->lmd_nidnet, strlen(lmd->lmd_nidnet) + 1);
- lmd->lmd_nidnet = NULL;
- rc = -EINVAL;
- CERROR("%s: option 'network=' not allowed for Lustre servers: rc = %d\n",
- devname, rc);
- GOTO(invalid, rc);
- }
}
/* Save mount options */
static int lwp_setup(const struct lu_env *env, struct lwp_device *lwp,
char *nidstring)
{
- struct lustre_cfg_bufs *bufs = NULL;
- struct lustre_cfg *lcfg = NULL;
- char *lwp_name = lwp->lpd_obd->obd_name;
- char *server_uuid = NULL;
- char *ptr;
- int uuid_len = -1;
- struct obd_import *imp;
- int len = strlen(lwp_name) + 1;
- int rc;
- const char *lwp_marker = "-" LUSTRE_LWP_NAME "-";
+ const char *lwp_marker = "-" LUSTRE_LWP_NAME "-";
+ char *lwp_name = lwp->lpd_obd->obd_name;
+ struct lustre_mount_info *lmi = NULL;
+ struct lustre_cfg_bufs *bufs = NULL;
+ struct lustre_cfg *lcfg = NULL;
+ int len = strlen(lwp_name) + 1;
+ struct lustre_sb_info *lsi;
+ char *server_uuid = NULL;
+ struct obd_import *imp;
+ char *target = NULL;
+ char *nidnet = NULL;
+ int uuid_len = -1;
+ char *ptr;
+ int rc;
+
ENTRY;
lwp->lpd_notify_task = NULL;
lustre_cfg_bufs_reset(bufs, lwp_name);
lustre_cfg_bufs_set_string(bufs, 1, server_uuid);
lustre_cfg_bufs_set_string(bufs, 2, nidstring);
+
+ OBD_ALLOC(target, len);
+ if (!target)
+ GOTO(out, rc = -ENOMEM);
+ ptr = strchr(lwp_name, '-');
+ memcpy(target, lwp_name, ptr - lwp_name);
+ target[ptr - lwp_name] = '\0';
+ strlcat(target, strrchr(lwp_name, '-'), len);
+ lmi = server_get_mount(target);
+ if (lmi) {
+ lsi = s2lsi(lmi->lmi_sb);
+ if (lsi && lsi->lsi_lmd)
+ nidnet = lsi->lsi_lmd->lmd_nidnet;
+ if (nidnet) {
+ CDEBUG(D_CONFIG,
+ "Adding net %s info to setup command for %s\n",
+ nidnet, lwp->lpd_obd->obd_name);
+ lustre_cfg_bufs_set_string(bufs, 4, nidnet);
+ }
+ server_put_mount(target, false);
+ }
+
OBD_ALLOC(lcfg, lustre_cfg_len(bufs->lcfg_bufcount, bufs->lcfg_buflen));
if (!lcfg)
GOTO(out, rc = -ENOMEM);
rc = ptlrpc_init_import(imp);
out:
OBD_FREE_PTR(bufs);
+ OBD_FREE(target, len);
OBD_FREE(server_uuid, len);
OBD_FREE(lcfg, lustre_cfg_len(lcfg->lcfg_bufcount,
lcfg->lcfg_buflens));
err = ptlrpc_uuid_to_peer(uuid, &peer, &self, refnet);
if (err != 0) {
CNETERR("cannot find peer %s!\n", uuid->uuid);
- return NULL;
+ return ERR_PTR(err);
}
c = ptlrpc_connection_get(&peer, &self, uuid);
CDEBUG(D_INFO, "%s -> %p\n", uuid->uuid, c);
- return c;
+ return c ? c : ERR_PTR(-ENOENT);
}
/**
/* Choose the matching UUID that's closest */
while (lustre_uuid_to_peer(uuid->uuid, &dst_nid, count++) == 0) {
if (refnet != LNET_NET_ANY &&
- LNET_NID_NET(&dst_nid) != refnet)
+ LNET_NID_NET(&dst_nid) != refnet) {
+ if (rc < 0)
+ rc = -ENETUNREACH;
continue;
+ }
dist = LNetDist(&dst_nid, &src_nid, &order);
if (dist < 0)
char *lwpname = NULL;
char *lwpuuid = NULL;
struct lnet_nid nid;
+ char *nidnet;
+ __u32 refnet;
int rc;
ENTRY;
+
if (lcfg->lcfg_nid)
lnet_nid4_to_nid(lcfg->lcfg_nid, &nid);
else {
if (rc)
RETURN(rc);
}
+
+ nidnet = lsi->lsi_lmd->lmd_nidnet;
+ refnet = nidnet ? libcfs_str2net(nidnet) : LNET_NET_ANY;
+ if (refnet != LNET_NET_ANY && LNET_NID_NET(&nid) != refnet)
+ RETURN(-ENETUNREACH);
+
rc = class_add_uuid(lustre_cfg_string(lcfg, 1), &nid);
if (rc != 0) {
CERROR("%s: Can't add uuid: rc =%d\n", lsi->lsi_svname, rc);
OBD_FREE(lwpname, MTI_NAME_MAXLEN);
OBD_FREE(lwpuuid, MTI_NAME_MAXLEN);
- return rc;
+ RETURN(rc);
}
/* the caller is responsible for memory free */
lustre_cfg_init(lcfg, LCFG_ADD_CONN, bufs);
rc = class_add_conn(lwp, lcfg);
- if (rc < 0)
+ if (rc == -ENETUNREACH) {
+ CDEBUG(D_CONFIG,
+ "%s: ignore conn not on net %s: rc = %d\n",
+ lwpname, lsi->lsi_lmd->lmd_nidnet, rc);
+ rc = 0;
+ } else if (rc < 0) {
CERROR("%s: can't add conn: rc = %d\n", lwpname, rc);
+ }
OBD_FREE(lcfg, lustre_cfg_len(lcfg->lcfg_bufcount,
lcfg->lcfg_buflens));
case LCFG_ADD_UUID: {
if (cfg->cfg_flags == CFG_F_MARKER) {
rc = lustre_lwp_setup(lcfg, lsi, cfg->cfg_lwp_idx);
- /* XXX: process only the first nid as
+ /* XXX: process only the first nid if on restricted net,
* we don't need another instance of lwp
*/
- cfg->cfg_flags |= CFG_F_SKIP;
+ if (rc == -ENETUNREACH)
+ rc = 0;
+ else
+ cfg->cfg_flags |= CFG_F_SKIP;
} else if (cfg->cfg_flags == (CFG_F_MARKER | CFG_F_SKIP)) {
struct lnet_nid nid;
cfg->cfg_callback = client_lwp_config_process;
cfg->cfg_instance = ll_get_cfg_instance(sb);
rc = lustre_process_log(sb, logname, cfg);
+
/* need to remove config llog from mgc */
lsi->lsi_lwp_started = 1;
LOAD_MODULES_REMOTE=true unload_modules
LOAD_MODULES_REMOTE=true load_modules
+ # restore mgsnid on targets
+ for ((num = 1; num <= $MDSCOUNT; num++)); do
+ do_facet mds$num $TUNEFS --erase-param mgsnode \
+ $(mdsdevname $num)
+ do_facet mds$num $TUNEFS --mgsnode=$MGSNID $(mdsdevname $num)
+ done
+ for ((num = 1; num <= $OSTCOUNT; num++)); do
+ do_facet ost$num $TUNEFS --erase-param mgsnode \
+ $(ostdevname $num)
+ do_facet ost$num $TUNEFS --mgsnode=$MGSNID $(ostdevname $num)
+ done
+
do_facet mds1 $TUNEFS --erase-param failover.node $(mdsdevname 1)
if [ -n "$failover_mds1" ]; then
do_facet mds1 $TUNEFS \
cut -d'.' -f4-" '!=' $nid
for node in ${tgts//,/ }; do
wait_update_cond $node \
- "$LCTL get_param -N *.${FSNAME}*.exports | grep $nid |
+ "$LCTL get_param -N *.${FSNAME}*.exports.* | grep $nid |
cut -d'.' -f4-" '!=' $nid
done
do_facet mgs "$LCTL get_param *.MGS*.exports.*.export"
# add network $net2 on all nodes
do_rpc_nodes $all load_modules || error "unable to load modules on $all"
for node in ${all//,/ }; do
+ do_node $node "$LNETCTL set discovery 0" ||
+ error "Failed to disable discovery on $node"
do_node $node "$LNETCTL lnet configure" ||
error "unable to configure lnet on node $node"
infname=inf_$(echo $node | cut -d'.' -f1 | sed s+-+_+g)
LOAD_MODULES_REMOTE=true load_modules || error "failed to load modules"
+ # update MGSNID
+ MGSNID=$mgsnid_orig,$mgsnid_new
+ stack_trap "MGSNID=$mgsnid_orig" EXIT
+
+ # add mgsnid on @$net2 to targets
+ for ((num = 1; num <= $MDSCOUNT; num++)); do
+ do_facet mds$num $TUNEFS --erase-param mgsnode \
+ $(mdsdevname $num)
+ do_facet mds$num $TUNEFS --mgsnode=$MGSNID $(mdsdevname $num)
+ done
+ for ((num = 1; num <= $OSTCOUNT; num++)); do
+ do_facet ost$num $TUNEFS --erase-param mgsnode \
+ $(ostdevname $num)
+ do_facet ost$num $TUNEFS --mgsnode=$MGSNID $(ostdevname $num)
+ done
+
# necessary to do writeconf in order to register
# new @$net2 nid for targets
export SK_MOUNTED=false
setupall server_only || error "setupall failed"
export KEEP_ZPOOL="$KZPOOL"
- # update MGSNID
- MGSNID=$mgsnid_new
- stack_trap "MGSNID=$mgsnid_orig" EXIT
-
# on client, reconfigure LNet and turn LNet Dynamic Discovery off
$LUSTRE_RMMOD || error "$LUSTRE_RMMOD failed (1)"
load_modules || error "Failed to load modules"
cut -d'.' -f4-" '!=' $nid2
for node in ${tgts//,/ }; do
wait_update_cond $node \
- "$LCTL get_param -N *.${FSNAME}*.exports | grep $nid2 |
+ "$LCTL get_param -N *.${FSNAME}*.exports.* | grep $nid2|
cut -d'.' -f4-" '!=' $nid2
done
do_facet mgs "$LCTL get_param *.MGS*.exports.*.export"
mount_client $MOUNT ${MOUNT_OPTS},network=$net2 &&
error "client mount with '-o network' option should be refused"
+ # remount with '-o network' server side option
+ (( $MDS1_VERSION >= $(version_code 2.16.51) )) || return 0
+
+ KZPOOL=$KEEP_ZPOOL
+ export KEEP_ZPOOL="true"
+ stopall || error "stopall failed"
+ mountmgs
+ for ((num = 1; num <= $MDSCOUNT; num++)); do
+ start mds$num $(mdsdevname $num) $MDS_MOUNT_OPTS,network=$net2
+ done
+ for ((num = 1; num <= $OSTCOUNT; num++)); do
+ start ost$num $(ostdevname $num) $OST_MOUNT_OPTS,network=$net2
+ done
+ export KEEP_ZPOOL="$KZPOOL"
+ sleep 5
+
+ # check exports on servers are empty for $net
+ do_facet mgs "$LCTL get_param mgs.MGS.exports.*.export"
+ wait_update_facet_cond mgs \
+ "$LCTL get_param -N mgs.MGS.exports.*.export | \
+ grep ${net}.export | cut -d'@' -f2-" '!=' ${net}.export
+ do_nodes $tgts "$LCTL get_param *.${FSNAME}*.exports.*.export"
+ for node in ${tgts//,/ }; do
+ wait_update_cond $node \
+ "$LCTL get_param -N *.${FSNAME}*.exports.*.export | \
+ grep ${net}.export | cut -d'@' -f2-" '!=' ${net}.export
+ done
+
return 0
}
run_test 31 "client mount option '-o network'"
git://git.whamcloud.com / fs / lustre-release.git / commitdiff