mode_t proc_mode;
};
+/**
+ * Append a space separated list of current set flags to str.
+ */
+#define flag2str(port, flag) \
+ do { \
+ if ((port)->port##_##flag) { \
+ seq_printf(m, "%s" #flag, first ? "" : ", "); \
+ first = false; \
+ } \
+ } while (0)
+
+void obd_connect_seq_flags2str(struct seq_file *m, __u64 flags, __u64 flags2,
+ const char *sep);
+void obd_connect_data_seqprint(struct seq_file *m,
+ struct obd_connect_data *ocd);
+
/* if we find more consumers this could be generalized */
#define OBD_HIST_MAX 32
struct obd_histogram {
data->ocd_grant_max_blks = ddp->ddp_max_extent_blks;
}
- if (OCD_HAS_FLAG(data, GRANT)) {
- /* Save connect_data we have so far because tgt_grant_connect()
- * uses it to calculate grant. */
- exp->exp_connect_data = *data;
+ /* Save connect_data we have so far because tgt_grant_connect()
+ * uses it to calculate grant, and we want to save the client
+ * version before it is overwritten by LUSTRE_VERSION_CODE. */
+ exp->exp_connect_data = *data;
+ if (OCD_HAS_FLAG(data, GRANT))
tgt_grant_connect(env, exp, data, !reconnect);
- }
if (OCD_HAS_FLAG(data, MAXBYTES))
data->ocd_maxbytes = mdt->mdt_lut.lut_dt_conf.ddp_maxbytes;
.ldt_ctx_tags = LCT_MG_THREAD
};
-static int mgs_obd_connect(const struct lu_env *env, struct obd_export **exp,
- struct obd_device *obd, struct obd_uuid *cluuid,
- struct obd_connect_data *data, void *localdata)
+static int mgs_obd_reconnect(const struct lu_env *env, struct obd_export *exp,
+ struct obd_device *obd, struct obd_uuid *cluuid,
+ struct obd_connect_data *data, void *localdata)
{
- struct obd_export *lexp;
- struct lustre_handle conn = {
- .cookie = 0,
- };
- int rc;
-
ENTRY;
if (exp == NULL || obd == NULL || cluuid == NULL)
RETURN(-EINVAL);
- rc = class_connect(&conn, obd, cluuid);
- if (rc)
- RETURN(rc);
-
- lexp = class_conn2export(&conn);
- if (lexp == NULL)
- RETURN(-EFAULT);
+ tgt_counter_incr(exp, LPROC_MGS_CONNECT);
if (data != NULL) {
data->ocd_connect_flags &= MGS_CONNECT_SUPPORTED;
if (data->ocd_connect_flags & OBD_CONNECT_FLAGS2)
data->ocd_connect_flags2 &= MGS_CONNECT_SUPPORTED2;
+ exp->exp_connect_data = *data;
data->ocd_version = LUSTRE_VERSION_CODE;
- lexp->exp_connect_data = *data;
}
- tgt_counter_incr(lexp, LPROC_MGS_CONNECT);
-
- rc = mgs_export_stats_init(obd, lexp, localdata);
- if (rc)
- class_disconnect(lexp);
- else
- *exp = lexp;
-
- RETURN(rc);
+ RETURN(mgs_export_stats_init(obd, exp, localdata));
}
-static int mgs_obd_reconnect(const struct lu_env *env, struct obd_export *exp,
- struct obd_device *obd, struct obd_uuid *cluuid,
- struct obd_connect_data *data, void *localdata)
+static int mgs_obd_connect(const struct lu_env *env, struct obd_export **exp,
+ struct obd_device *obd, struct obd_uuid *cluuid,
+ struct obd_connect_data *data, void *localdata)
{
+ struct obd_export *lexp;
+ struct lustre_handle conn = {
+ .cookie = 0,
+ };
+ int rc;
+
ENTRY;
if (exp == NULL || obd == NULL || cluuid == NULL)
RETURN(-EINVAL);
- tgt_counter_incr(exp, LPROC_MGS_CONNECT);
+ rc = class_connect(&conn, obd, cluuid);
+ if (rc)
+ RETURN(rc);
- if (data != NULL) {
- data->ocd_connect_flags &= MGS_CONNECT_SUPPORTED;
+ lexp = class_conn2export(&conn);
+ if (lexp == NULL)
+ RETURN(-EFAULT);
- if (data->ocd_connect_flags & OBD_CONNECT_FLAGS2)
- data->ocd_connect_flags2 &= MGS_CONNECT_SUPPORTED2;
+ rc = mgs_obd_reconnect(env, lexp, obd, cluuid, data, localdata);
+ if (rc)
+ GOTO(out_disconnect, rc);
- data->ocd_version = LUSTRE_VERSION_CODE;
- exp->exp_connect_data = *data;
- }
+ *exp = lexp;
- RETURN(mgs_export_stats_init(obd, exp, localdata));
+ RETURN(rc);
+
+out_disconnect:
+ class_disconnect(lexp);
+
+ return rc;
}
static int mgs_obd_disconnect(struct obd_export *exp)
lprocfs_stats_unlock(stats, LPROCFS_GET_NUM_CPU, &flags);
}
-/**
- * Append a space separated list of current set flags to str.
- */
-#define flag2str(flag) \
- do { \
- if (imp->imp_##flag) { \
- seq_printf(m, "%s" #flag, first ? "" : ", "); \
- first = false; \
- } \
- } while (0)
static void obd_import_flags2str(struct obd_import *imp, struct seq_file *m)
{
bool first = true;
first = false;
}
- flag2str(invalid);
- flag2str(deactive);
- flag2str(replayable);
- flag2str(delayed_recovery);
- flag2str(vbr_failed);
- flag2str(pingable);
- flag2str(resend_replay);
- flag2str(no_pinger_recover);
- flag2str(need_mne_swab);
- flag2str(connect_tried);
+ flag2str(imp, invalid);
+ flag2str(imp, deactive);
+ flag2str(imp, replayable);
+ flag2str(imp, delayed_recovery);
+ flag2str(imp, vbr_failed);
+ flag2str(imp, pingable);
+ flag2str(imp, resend_replay);
+ flag2str(imp, no_pinger_recover);
+ flag2str(imp, need_mne_swab);
+ flag2str(imp, connect_tried);
}
-#undef flag2str
static const char *obd_connect_names[] = {
/* flags names */
NULL
};
-static void obd_connect_seq_flags2str(struct seq_file *m, __u64 flags,
- __u64 flags2, const char *sep)
+void obd_connect_seq_flags2str(struct seq_file *m, __u64 flags, __u64 flags2,
+ const char *sep)
{
bool first = true;
__u64 mask;
first = false;
}
}
+EXPORT_SYMBOL(obd_connect_seq_flags2str);
int obd_connect_flags2str(char *page, int count, __u64 flags, __u64 flags2,
const char *sep)
}
EXPORT_SYMBOL(obd_connect_flags2str);
-static void obd_connect_data_seqprint(struct seq_file *m,
- struct obd_connect_data *ocd)
+void
+obd_connect_data_seqprint(struct seq_file *m, struct obd_connect_data *ocd)
{
__u64 flags;
}
EXPORT_SYMBOL(lprocfs_num_exports_seq_show);
+static int obd_export_flags2str(struct obd_export *exp, struct seq_file *m)
+{
+ bool first = true;
+
+ flag2str(exp, failed);
+ flag2str(exp, in_recovery);
+ flag2str(exp, disconnected);
+ flag2str(exp, connecting);
+
+ return 0;
+}
+
+static int
+lprocfs_exp_print_export_seq(struct cfs_hash *hs, struct cfs_hash_bd *bd,
+ struct hlist_node *hnode, void *cb_data)
+{
+ struct seq_file *m = cb_data;
+ struct obd_export *exp = cfs_hash_object(hs, hnode);
+ struct obd_device *obd;
+ struct obd_connect_data *ocd;
+
+ LASSERT(exp != NULL);
+ if (exp->exp_nid_stats == NULL)
+ goto out;
+ obd = exp->exp_obd;
+ ocd = &exp->exp_connect_data;
+
+ seq_printf(m, "%s:\n"
+ " name: %s\n"
+ " client: %s\n"
+ " connect_flags: [ ",
+ obd_uuid2str(&exp->exp_client_uuid),
+ obd->obd_name,
+ obd_export_nid2str(exp));
+ obd_connect_seq_flags2str(m, ocd->ocd_connect_flags,
+ ocd->ocd_connect_flags2, ", ");
+ seq_printf(m, " ]\n");
+ obd_connect_data_seqprint(m, ocd);
+ seq_printf(m, " export_flags: [ ");
+ obd_export_flags2str(exp, m);
+ seq_printf(m, " ]\n");
+
+out:
+ return 0;
+}
+
+/**
+ * RPC connections are composed of an import and an export. Using the
+ * lctl utility we can extract important information about the state.
+ * The lprocfs_exp_export_seq_show routine displays the state information
+ * for the export.
+ *
+ * \param[in] m seq file
+ * \param[in] data unused
+ *
+ * \retval 0 on success
+ *
+ * The format of the export state information is like:
+ * a793e354-49c0-aa11-8c4f-a4f2b1a1a92b:
+ * name: MGS
+ * client: 10.211.55.10@tcp
+ * connect_flags: [ version, barrier, adaptive_timeouts, ... ]
+ * connect_data:
+ * flags: 0x2000011005002020
+ * instance: 0
+ * target_version: 2.10.51.0
+ * export_flags: [ ... ]
+ *
+ */
+static int lprocfs_exp_export_seq_show(struct seq_file *m, void *data)
+{
+ struct nid_stat *stats = m->private;
+ struct obd_device *obd = stats->nid_obd;
+
+ cfs_hash_for_each_key(obd->obd_nid_hash, &stats->nid,
+ lprocfs_exp_print_export_seq, m);
+ return 0;
+}
+LPROC_SEQ_FOPS_RO(lprocfs_exp_export);
+
static void lprocfs_free_client_stats(struct nid_stat *client_stat)
{
CDEBUG(D_CONFIG, "stat %p - data %p/%p\n", client_stat,
&lprocfs_exp_nodemap_fops);
if (IS_ERR(entry)) {
rc = PTR_ERR(entry);
- CWARN("Error adding the nodemap file: rc = %d\n", rc);
+ CWARN("%s: error adding the nodemap file: rc = %d\n",
+ obd->obd_name, rc);
GOTO(destroy_new_ns, rc);
}
&lprocfs_exp_uuid_fops);
if (IS_ERR(entry)) {
rc = PTR_ERR(entry);
- CWARN("Error adding the NID stats file: rc = %d\n", rc);
+ CWARN("%s: error adding the NID stats file: rc = %d\n",
+ obd->obd_name, rc);
GOTO(destroy_new_ns, rc);
}
&lprocfs_exp_hash_fops);
if (IS_ERR(entry)) {
rc = PTR_ERR(entry);
- CWARN("Error adding the hash file: rc = %d\n", rc);
+ CWARN("%s: error adding the hash file: rc = %d\n",
+ obd->obd_name, rc);
+ GOTO(destroy_new_ns, rc);
+ }
+
+ entry = lprocfs_add_simple(new_stat->nid_proc, "export",
+ new_stat, &lprocfs_exp_export_fops);
+ if (IS_ERR(entry)) {
+ rc = PTR_ERR(entry);
+ CWARN("%s: error adding the export file: rc = %d\n",
+ obd->obd_name, rc);
GOTO(destroy_new_ns, rc);
}
&lprocfs_exp_replydata_fops);
if (IS_ERR(entry)) {
rc = PTR_ERR(entry);
- CWARN("%s: Error adding the reply_data file: rc = %d\n",
+ CWARN("%s: error adding the reply_data file: rc = %d\n",
obd->obd_name, rc);
GOTO(destroy_new_ns, rc);
}
if (data->ocd_connect_flags & OBD_CONNECT_FLAGS2)
data->ocd_connect_flags2 &= OST_CONNECT_SUPPORTED2;
- data->ocd_version = LUSTRE_VERSION_CODE;
-
/* Kindly make sure the SKIP_ORPHAN flag is from MDS. */
if (data->ocd_connect_flags & OBD_CONNECT_MDS)
CDEBUG(D_HA, "%s: Received MDS connection for group %u\n",
data->ocd_grant_max_blks = ddp->ddp_max_extent_blks;
}
- if (OCD_HAS_FLAG(data, GRANT)) {
- /* Save connect_data we have so far because tgt_grant_connect()
- * uses it to calculate grant. */
- exp->exp_connect_data = *data;
+ /* Save connect_data we have so far because tgt_grant_connect()
+ * uses it to calculate grant, and we want to save the client
+ * version before it is overwritten by LUSTRE_VERSION_CODE. */
+ exp->exp_connect_data = *data;
+ if (OCD_HAS_FLAG(data, GRANT))
tgt_grant_connect(env, exp, data, new_connection);
- }
if (data->ocd_connect_flags & OBD_CONNECT_INDEX) {
struct lr_server_data *lsd = &ofd->ofd_lut.lut_lsd;
if (data->ocd_connect_flags & OBD_CONNECT_MAXBYTES)
data->ocd_maxbytes = ofd->ofd_lut.lut_dt_conf.ddp_maxbytes;
+ data->ocd_version = LUSTRE_VERSION_CODE;
+
if (OCD_HAS_FLAG(data, PINGLESS)) {
if (ptlrpc_pinger_suppress_pings()) {
spin_lock(&exp->exp_obd->obd_dev_lock);
}
run_test 0c "check import proc"
+test_0d() { # LU-3397
+ [ $(lustre_version_code mgs) -lt $(version_code 2.10.57) ] &&
+ skip "proc exports not supported before 2.10.57" && return
+
+ local mgs_exp="mgs.MGS.exports"
+ local client_uuid=$($LCTL get_param -n mgc.*.uuid)
+ local exp_client_nid
+ local exp_client_version
+ local exp_val
+ local imp_val
+ local temp_imp=$DIR/$tfile.import
+ local temp_exp=$DIR/$tfile.export
+
+ # save mgc import file to $temp_imp
+ $LCTL get_param mgc.*.import | tee $temp_imp
+ # Check if client uuid is found in MGS export
+ for exp_client_nid in $(do_facet mgs $LCTL get_param -N $mgs_exp.*); do
+ [ $(do_facet mgs $LCTL get_param $exp_client_nid.uuid) == \
+ $client_uuid ] &&
+ break;
+ done
+ # save mgs export file to $temp_exp
+ do_facet mgs $LCTL get_param $exp_client_nid.export | tee $temp_exp
+
+ # Compare the value of field "connect_flags"
+ imp_val=$(grep "connect_flags" $temp_imp)
+ exp_val=$(grep "connect_flags" $temp_exp)
+ [ "$exp_val" == "$imp_val" ] ||
+ error "export flags '$exp_val' != import flags '$imp_val'"
+
+ # Compare the value of client version
+ exp_client_version=$(awk '/target_version:/ { print $2 }' $temp_exp)
+ exp_val=$(version_code $exp_client_version)
+ imp_val=$(lustre_version_code client)
+ [ "$exp_val" == "$imp_val" ] ||
+ error "export client version '$exp_val' != '$imp_val'"
+}
+run_test 0d "check export proc ============================="
+
test_1() {
test_mkdir $DIR/$tdir
test_mkdir $DIR/$tdir/d2
git://git.whamcloud.com / fs / lustre-release.git / commitdiff