X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdc%2Flproc_mdc.c;h=6d7298f5f8b2588e5194b25bf619504d93c24040;hb=refs%2Fchanges%2F60%2F7460%2F4;hp=e78332d0024ed0fd4a0ee7fc3badfa8d4a72c3e4;hpb=2f347eb0da65973bfc4acbd49ad48698bf71441f;p=fs%2Flustre-release.git diff --git a/lustre/mdc/lproc_mdc.c b/lustre/mdc/lproc_mdc.c index e78332d..6d7298f 100644 --- a/lustre/mdc/lproc_mdc.c +++ b/lustre/mdc/lproc_mdc.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -39,7 +39,6 @@ #include #include #include -#include #ifdef LPROCFS @@ -77,177 +76,6 @@ static int mdc_wr_max_rpcs_in_flight(struct file *file, const char *buffer, return count; } -static struct lnl_hdr *changelog_lnl_alloc(int len, int flags) -{ - struct lnl_hdr *lh; - - OBD_ALLOC(lh, len); - if (lh == NULL) - RETURN(NULL); - - lh->lnl_magic = LNL_MAGIC; - lh->lnl_transport = LNL_TRANSPORT_CHANGELOG; - lh->lnl_flags = flags; - lh->lnl_msgtype = CL_RECORD; - lh->lnl_msglen = len; - return lh; -} - -#define D_CHANGELOG 0 - -static int changelog_show_cb(struct llog_handle *llh, struct llog_rec_hdr *hdr, - void *data) -{ - struct changelog_show *cs = data; - struct llog_changelog_rec *rec = (struct llog_changelog_rec *)hdr; - struct lnl_hdr *lh; - int len, rc; - ENTRY; - - if ((rec->cr_hdr.lrh_type != CHANGELOG_REC) || - (rec->cr.cr_type >= CL_LAST)) { - CERROR("Not a changelog rec %d/%d\n", rec->cr_hdr.lrh_type, - rec->cr.cr_type); - RETURN(-EINVAL); - } - - if (rec->cr.cr_index < cs->cs_startrec) { - /* Skip entries earlier than what we are interested in */ - CDEBUG(D_CHANGELOG, "rec="LPU64" start="LPU64"\n", - rec->cr.cr_index, cs->cs_startrec); - RETURN(0); - } - - CDEBUG(D_CHANGELOG, LPU64" %02d%-5s "LPU64" 0x%x t="DFID" p="DFID - " %.*s\n", rec->cr.cr_index, rec->cr.cr_type, - changelog_type2str(rec->cr.cr_type), rec->cr.cr_time, - rec->cr.cr_flags & CLF_FLAGMASK, - PFID(&rec->cr.cr_tfid), PFID(&rec->cr.cr_pfid), - rec->cr.cr_namelen, rec->cr.cr_name); - - len = sizeof(*lh) + sizeof(rec->cr) + rec->cr.cr_namelen; - - /* Set up the netlink message */ - lh = changelog_lnl_alloc(len, cs->cs_flags); - if (lh == NULL) - RETURN(-ENOMEM); - memcpy(lh + 1, &rec->cr, len - sizeof(*lh)); - - rc = libcfs_klnl_msg_put(cs->cs_pid, 0, lh); - CDEBUG(D_CHANGELOG, "nlmsg pid %d len %d rc %d\n", cs->cs_pid, len, rc); - - OBD_FREE(lh, len); - - RETURN(rc); -} - -static int lproc_mdc_wr_changelog(struct file *file, const char *buffer, - unsigned long count, void *data) -{ - struct obd_device *obd = data; - struct llog_ctxt *ctxt; - struct llog_handle *llh; - struct lnl_hdr *lnlh; - struct changelog_show cs = {}; - int rc; - - if (count != sizeof(cs)) - return -EINVAL; - - if (cfs_copy_from_user(&cs, buffer, sizeof(cs))) - return -EFAULT; - - CDEBUG(D_CHANGELOG, "changelog to pid=%d start "LPU64"\n", - cs.cs_pid, cs.cs_startrec); - - /* Set up the remote catalog handle */ - ctxt = llog_get_context(obd, LLOG_CHANGELOG_REPL_CTXT); - if (ctxt == NULL) - RETURN(-ENOENT); - rc = llog_create(ctxt, &llh, NULL, CHANGELOG_CATALOG); - if (rc) { - CERROR("llog_create() failed %d\n", rc); - GOTO(out, rc); - } - rc = llog_init_handle(llh, LLOG_F_IS_CAT, NULL); - if (rc) { - CERROR("llog_init_handle failed %d\n", rc); - GOTO(out, rc); - } - - rc = llog_cat_process(llh, changelog_show_cb, &cs, 0, 0); - - /* Send EOF */ - if ((lnlh = changelog_lnl_alloc(sizeof(*lnlh), cs.cs_flags))) { - lnlh->lnl_msgtype = CL_EOF; - libcfs_klnl_msg_put(cs.cs_pid, 0, lnlh); - OBD_FREE(lnlh, sizeof(*lnlh)); - } - -out: - if (llh) - llog_cat_put(llh); - if (ctxt) - llog_ctxt_put(ctxt); - if (rc < 0) - return rc; - return count; -} - -/* temporary for testing */ -static int mdc_wr_netlink(struct file *file, const char *buffer, - unsigned long count, void *data) -{ - struct obd_device *obd = data; - struct lnl_hdr *lh; - struct hsm_action_list *hal; - struct hsm_action_item *hai; - int len; - int pid, rc; - - rc = lprocfs_write_helper(buffer, count, &pid); - if (rc) - return rc; - - if (pid < 0) - return -ERANGE; - CWARN("message to pid %d\n", pid); - - len = sizeof(*lh) + sizeof(*hal) + MTI_NAME_MAXLEN + - /* for mockup below */ 2 * cfs_size_round(sizeof(*hai)); - - OBD_ALLOC(lh, len); - - lh->lnl_magic = LNL_MAGIC; - lh->lnl_transport = LNL_TRANSPORT_HSM; - lh->lnl_msgtype = HMT_ACTION_LIST; - lh->lnl_msglen = len; - - hal = (struct hsm_action_list *)(lh + 1); - hal->hal_version = HAL_VERSION; - hal->hal_archive_num = 1; - obd_uuid2fsname(hal->hal_fsname, obd->obd_name, MTI_NAME_MAXLEN); - - /* mock up an action list */ - hal->hal_count = 2; - hai = hai_zero(hal); - hai->hai_action = HSMA_ARCHIVE; - hai->hai_fid.f_oid = 5; - hai->hai_len = sizeof(*hai); - hai = hai_next(hai); - hai->hai_action = HSMA_RESTORE; - hai->hai_fid.f_oid = 10; - hai->hai_len = sizeof(*hai); - - /* This works for either broadcast or unicast to a single pid */ - rc = libcfs_klnl_msg_put(pid, pid == 0 ? LNL_GRP_HSM : 0, lh); - - OBD_FREE(lh, len); - if (rc < 0) - return rc; - return count; -} - static struct lprocfs_vars lprocfs_mdc_obd_vars[] = { { "uuid", lprocfs_rd_uuid, 0, 0 }, { "ping", 0, lprocfs_wr_ping, 0, 0, 0222 }, @@ -261,13 +89,21 @@ static struct lprocfs_vars lprocfs_mdc_obd_vars[] = { /*{ "filegroups", lprocfs_rd_filegroups, 0, 0 },*/ { "mds_server_uuid", lprocfs_rd_server_uuid, 0, 0 }, { "mds_conn_uuid", lprocfs_rd_conn_uuid, 0, 0 }, + /* + * FIXME: below proc entry is provided, but not in used, instead + * sbi->sb_md_brw_size is used, the per obd variable should be used + * when CMD is enabled, and dir pages are managed in MDC layer. + * Remember to enable proc write function. + */ + { "max_pages_per_rpc", lprocfs_obd_rd_max_pages_per_rpc, + /* lprocfs_obd_wr_max_pages_per_rpc */0, 0 }, { "max_rpcs_in_flight", mdc_rd_max_rpcs_in_flight, mdc_wr_max_rpcs_in_flight, 0 }, { "timeouts", lprocfs_rd_timeouts, 0, 0 }, - { "import", lprocfs_rd_import, 0, 0 }, + { "import", lprocfs_rd_import, lprocfs_wr_import, 0 }, { "state", lprocfs_rd_state, 0, 0 }, - { "changelog_trigger",0,lproc_mdc_wr_changelog, 0 }, - { "hsm_nl", 0, mdc_wr_netlink, 0, 0, 0222 }, + { "pinger_recov", lprocfs_rd_pinger_recov, + lprocfs_wr_pinger_recov, 0, 0 }, { 0 } };