X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdc%2Flproc_mdc.c;h=4f25f368649ba3a016d72cfe0e1218d387cfb4cd;hp=72d3790e3e9a14bd3e754dbaf2872ddbdbcfb86d;hb=3c585bf063ccd2505cf60a7b6170d0bd63c9117d;hpb=3d7756a454b7d643dc27fbb88086769be8100ef2 diff --git a/lustre/mdc/lproc_mdc.c b/lustre/mdc/lproc_mdc.c index 72d3790..4f25f36 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, Whamcloud, Inc. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -39,7 +39,6 @@ #include #include #include -#include #ifdef LPROCFS @@ -50,9 +49,9 @@ static int mdc_rd_max_rpcs_in_flight(char *page, char **start, off_t off, struct client_obd *cli = &dev->u.cli; int rc; - spin_lock(&cli->cl_loi_list_lock); + client_obd_list_lock(&cli->cl_loi_list_lock); rc = snprintf(page, count, "%u\n", cli->cl_max_rpcs_in_flight); - spin_unlock(&cli->cl_loi_list_lock); + client_obd_list_unlock(&cli->cl_loi_list_lock); return rc; } @@ -70,67 +69,72 @@ static int mdc_wr_max_rpcs_in_flight(struct file *file, const char *buffer, if (val < 1 || val > MDC_MAX_RIF_MAX) return -ERANGE; - spin_lock(&cli->cl_loi_list_lock); + client_obd_list_lock(&cli->cl_loi_list_lock); cli->cl_max_rpcs_in_flight = val; - spin_unlock(&cli->cl_loi_list_lock); + client_obd_list_unlock(&cli->cl_loi_list_lock); return count; } -static int mdc_changelog_seq_release(struct inode *inode, struct file *file) -{ - struct seq_file *seq = file->private_data; - struct changelog_seq_iter *csi = seq->private; - - if (csi && csi->csi_llh) - llog_cat_put(csi->csi_llh); - if (csi && csi->csi_ctxt) - llog_ctxt_put(csi->csi_ctxt); - - return (changelog_seq_release(inode, file)); -} - -static int mdc_changelog_seq_open(struct inode *inode, struct file *file) +/* temporary for testing */ +static int mdc_wr_kuc(struct file *file, const char *buffer, + unsigned long count, void *data) { - struct changelog_seq_iter *csi; - int rc; - ENTRY; - - rc = changelog_seq_open(inode, file, &csi); + struct obd_device *obd = data; + struct kuc_hdr *lh; + struct hsm_action_list *hal; + struct hsm_action_item *hai; + int len; + int fd, rc; + + rc = lprocfs_write_helper(buffer, count, &fd); if (rc) - RETURN(rc); - - /* Set up the remote catalog handle */ - /* Note the proc file is set up with obd in data, not mdc_device */ - csi->csi_ctxt = llog_get_context((struct obd_device *)csi->csi_dev, - LLOG_CHANGELOG_REPL_CTXT); - if (csi->csi_ctxt == NULL) - GOTO(out, rc = -ENOENT); - rc = llog_create(csi->csi_ctxt, &csi->csi_llh, NULL, CHANGELOG_CATALOG); - if (rc) { - CERROR("llog_create() failed %d\n", rc); - GOTO(out, rc); - } - rc = llog_init_handle(csi->csi_llh, LLOG_F_IS_CAT, NULL); - if (rc) { - CERROR("llog_init_handle failed %d\n", rc); - GOTO(out, rc); - } + return rc; -out: - if (rc) - mdc_changelog_seq_release(inode, file); - RETURN(rc); + if (fd < 0) + return -ERANGE; + CWARN("message to fd %d\n", fd); + + len = sizeof(*lh) + sizeof(*hal) + MTI_NAME_MAXLEN + + /* for mockup below */ 2 * cfs_size_round(sizeof(*hai)); + + OBD_ALLOC(lh, len); + + lh->kuc_magic = KUC_MAGIC; + lh->kuc_transport = KUC_TRANSPORT_HSM; + lh->kuc_msgtype = HMT_ACTION_LIST; + lh->kuc_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 fd */ + if (fd == 0) { + rc = libcfs_kkuc_group_put(KUC_GRP_HSM, lh); + } else { + cfs_file_t *fp = cfs_get_fd(fd); + rc = libcfs_kkuc_msg_put(fp, lh); + cfs_put_file(fp); + } + OBD_FREE(lh, len); + if (rc < 0) + return rc; + return count; } -static struct file_operations mdc_changelog_fops = { - .owner = THIS_MODULE, - .open = mdc_changelog_seq_open, - .read = seq_read, - .llseek = changelog_seq_lseek, - .release = mdc_changelog_seq_release, -}; - static struct lprocfs_vars lprocfs_mdc_obd_vars[] = { { "uuid", lprocfs_rd_uuid, 0, 0 }, { "ping", 0, lprocfs_wr_ping, 0, 0, 0222 }, @@ -144,12 +148,22 @@ 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", 0, 0, 0, &mdc_changelog_fops, 0400 }, + { "hsm_nl", 0, mdc_wr_kuc, 0, 0, 0200 }, + { "pinger_recov", lprocfs_rd_pinger_recov, + lprocfs_wr_pinger_recov, 0, 0 }, { 0 } };