X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_test.c;h=a70eed2f5d485c2507bdbdd8ba90eaea4518a4f0;hp=e3edd02aee7ab81e502d976e83900422d2b3b9a9;hb=d2d56f38da01001c92a09afc6b52b5acbd9bc13c;hpb=e87585ce9b9a9975e05e5b02623777b7322233f9 diff --git a/lustre/obdclass/llog_test.c b/lustre/obdclass/llog_test.c index e3edd02..a70eed2 100644 --- a/lustre/obdclass/llog_test.c +++ b/lustre/obdclass/llog_test.c @@ -4,20 +4,23 @@ * Copyright (C) 2003 Cluster File Systems, Inc. * Author: Phil Schwan * - * This file is part of Lustre, http://www.lustre.org/ + * This file is part of the Lustre file system, http://www.lustre.org + * Lustre is a trademark of Cluster File Systems, Inc. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * You may have signed or agreed to another license before downloading + * this software. If so, you are bound by the terms and conditions + * of that agreement, and the following does not apply to you. See the + * LICENSE file included with this distribution for more information. * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * If you did not agree to a different license, then this copy of Lustre + * is open source software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * In either case, Lustre is distributed in the hope that it will be + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license text for more details. * * A kernel module which tests the llog API from the OBD setup function. */ @@ -30,9 +33,8 @@ #include #include -#include -#include -#include /* for LUSTRE_MDC_NAME */ +#include +#include static int llog_test_rand; static struct obd_uuid uuid = { .uuid = "test_uuid" }; @@ -364,8 +366,6 @@ static int llog_cancel_rec_cb(struct llog_handle *llh, struct llog_rec_hdr *rec, RETURN(0); } - - /* Test log and catalogue processing */ static int llog_test_5(struct obd_device *obd) { @@ -389,7 +389,7 @@ static int llog_test_5(struct obd_device *obd) llog_init_handle(llh, LLOG_F_IS_CAT, &uuid); CWARN("5b: print the catalog entries.. we expect 2\n"); - rc = llog_process(llh, (llog_cb_t)cat_print_cb, "test 5", NULL); + rc = llog_process(llh, cat_print_cb, "test 5", NULL); if (rc) { CERROR("5b: process with cat_print_cb failed: %d\n", rc); GOTO(out, rc); @@ -411,7 +411,7 @@ static int llog_test_5(struct obd_device *obd) } CWARN("5b: print the catalog entries.. we expect 1\n"); - rc = llog_process(llh, (llog_cb_t)cat_print_cb, "test 5", NULL); + rc = llog_process(llh, cat_print_cb, "test 5", NULL); if (rc) { CERROR("5b: process with cat_print_cb failed: %d\n", rc); GOTO(out, rc); @@ -424,6 +424,13 @@ static int llog_test_5(struct obd_device *obd) GOTO(out, rc); } + CWARN("5f: print plain log entries reversely.. expect 6\n"); + rc = llog_cat_reverse_process(llh, plain_print_cb, "foobar"); + if (rc) { + CERROR("5f: reversely process with plain_print_cb failed: %d\n", rc); + GOTO(out, rc); + } + out: CWARN("5: close re-opened catalog\n"); if (llh) @@ -454,7 +461,8 @@ static int llog_test_6(struct obd_device *obd, char *name) RETURN(-ENOENT); } - rc = obd_connect(&exph, mdc_obd, &uuid); + rc = obd_connect(NULL, + &exph, mdc_obd, &uuid, NULL /* obd_connect_data */); if (rc) { CERROR("6: failed to connect to MDC: %s\n", mdc_obd->obd_name); RETURN(rc); @@ -474,17 +482,21 @@ static int llog_test_6(struct obd_device *obd, char *name) GOTO(parse_out, rc); } - rc = llog_process(llh, (llog_cb_t)plain_print_cb, NULL, NULL); + rc = llog_process(llh, plain_print_cb, NULL, NULL); if (rc) CERROR("6: llog_process failed %d\n", rc); + rc = llog_reverse_process(llh, plain_print_cb, NULL, NULL); + if (rc) + CERROR("6: llog_reverse_process failed %d\n", rc); + parse_out: rc = llog_close(llh); if (rc) { CERROR("6: llog_close failed: rc = %d\n", rc); } - rc = obd_disconnect(exp, 0); + rc = obd_disconnect(exp); RETURN(rc); } @@ -509,8 +521,8 @@ static int llog_test_7(struct obd_device *obd) } llog_init_handle(llh, LLOG_F_IS_PLAIN, &uuid); - lcr.lcr_hdr.lrh_len = lcr.lcr_tail.lrt_len = cpu_to_le32(sizeof(lcr)); - lcr.lcr_hdr.lrh_type = cpu_to_le32(OST_SZ_REC); + lcr.lcr_hdr.lrh_len = lcr.lcr_tail.lrt_len = sizeof(lcr); + lcr.lcr_hdr.lrh_type = OST_SZ_REC; rc = llog_write_rec(llh, &lcr.lcr_hdr, NULL, 0, NULL, -1); if (rc) { CERROR("7: write one log record failed: %d\n", rc); @@ -518,10 +530,10 @@ static int llog_test_7(struct obd_device *obd) } rc = llog_destroy(llh); - if (rc) + if (rc) CERROR("7: llog_destroy failed: %d\n", rc); else - llog_free_handle(llh); + llog_free_handle(llh); RETURN(rc); } @@ -531,14 +543,14 @@ static int llog_test_7(struct obd_device *obd) static int llog_run_tests(struct obd_device *obd) { struct llog_handle *llh; - struct obd_run_ctxt saved; + struct lvfs_run_ctxt saved; struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT); int rc, err, cleanup_phase = 0; char name[10]; ENTRY; sprintf(name, "%x", llog_test_rand); - push_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL); + push_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_lvfs_ctxt, NULL); rc = llog_test_1(obd, name); if (rc) @@ -578,20 +590,22 @@ static int llog_run_tests(struct obd_device *obd) if (!rc) rc = err; case 0: - pop_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL); + pop_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_lvfs_ctxt, NULL); } return rc; } -static int llog_test_llog_init(struct obd_device *obd, struct obd_device *tgt, - int count, struct llog_catid *logid) +static int llog_test_llog_init(struct obd_device *obd, struct obd_llogs *llogs, + struct obd_device *tgt, int count, + struct llog_catid *logid, struct obd_uuid *uuid) { int rc; ENTRY; - rc = llog_setup(obd, LLOG_TEST_ORIG_CTXT, tgt, 0, NULL, &llog_lvfs_ops); + rc = llog_setup(obd, llogs, LLOG_TEST_ORIG_CTXT, tgt, 0, NULL, + &llog_lvfs_ops); RETURN(rc); } @@ -604,84 +618,78 @@ static int llog_test_llog_finish(struct obd_device *obd, int count) RETURN(rc); } -static int llog_test_cleanup(struct obd_device *obd, int flags) +static int llog_test_cleanup(struct obd_device *obd) { int rc = obd_llog_finish(obd, 0); if (rc) CERROR("failed to llog_test_llog_finish: %d\n", rc); + lprocfs_obd_cleanup(obd); + return rc; } -static int llog_test_setup(struct obd_device *obd, obd_count len, void *buf) +static int llog_test_setup(struct obd_device *obd, struct lustre_cfg *lcfg) { - struct lustre_cfg *lcfg = buf; + struct lprocfs_static_vars lvars; struct obd_device *tgt; int rc; ENTRY; - if (lcfg->lcfg_inllen1 < 1) { + if (lcfg->lcfg_bufcount < 2) { CERROR("requires a TARGET OBD name\n"); RETURN(-EINVAL); } - tgt = class_name2obd(lcfg->lcfg_inlbuf1); + if (lcfg->lcfg_buflens[1] < 1) { + CERROR("requires a TARGET OBD name\n"); + RETURN(-EINVAL); + } + + tgt = class_name2obd(lustre_cfg_string(lcfg, 1)); if (!tgt || !tgt->obd_attached || !tgt->obd_set_up) { CERROR("target device not attached or not set up (%s)\n", - lcfg->lcfg_inlbuf1); + lustre_cfg_string(lcfg, 1)); RETURN(-EINVAL); } - rc = obd_llog_init(obd, tgt, 0, NULL); + rc = obd_llog_init(obd, NULL, tgt, 0, NULL, NULL); if (rc) RETURN(rc); - llog_test_rand = ll_insecure_random_int(); + llog_test_rand = ll_rand(); rc = llog_run_tests(obd); if (rc) - llog_test_cleanup(obd, 0); - RETURN(rc); -} - -static struct lprocfs_vars lprocfs_ost_obd_vars[] = { {0} }; -static struct lprocfs_vars lprocfs_ost_module_vars[] = { {0} }; -LPROCFS_INIT_VARS(ost, lprocfs_ost_module_vars, lprocfs_ost_obd_vars) - -static int llog_test_attach(struct obd_device *dev, obd_count len, void *data) -{ - struct lprocfs_static_vars lvars; + llog_test_cleanup(obd); - lprocfs_init_vars(ost, &lvars); - return lprocfs_obd_attach(dev, lvars.obd_vars); -} + lprocfs_init_vars(llog_test, &lvars); + lprocfs_obd_setup(obd, lvars.obd_vars); -static int llog_test_detach(struct obd_device *dev) -{ - return lprocfs_obd_detach(dev); + RETURN(rc); } static struct obd_ops llog_obd_ops = { - o_owner: THIS_MODULE, - o_attach: llog_test_attach, - o_detach: llog_test_detach, - o_setup: llog_test_setup, - o_cleanup: llog_test_cleanup, - o_llog_init: llog_test_llog_init, - o_llog_finish: llog_test_llog_finish, - + .o_owner = THIS_MODULE, + .o_setup = llog_test_setup, + .o_cleanup = llog_test_cleanup, + .o_llog_init = llog_test_llog_init, + .o_llog_finish = llog_test_llog_finish, }; +#ifdef LPROCFS static struct lprocfs_vars lprocfs_obd_vars[] = { {0} }; static struct lprocfs_vars lprocfs_module_vars[] = { {0} }; LPROCFS_INIT_VARS(llog_test, lprocfs_module_vars, lprocfs_obd_vars) +#endif static int __init llog_test_init(void) { struct lprocfs_static_vars lvars; lprocfs_init_vars(llog_test, &lvars); - return class_register_type(&llog_obd_ops,lvars.module_vars,"llog_test"); + return class_register_type(&llog_obd_ops, NULL, + lvars.module_vars,"llog_test", NULL); } static void __exit llog_test_exit(void)