X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_test.c;h=3a839f1d9cc250df26adc995c91da094e1c55d40;hb=6957329b064f72db289ae93d0a7776cb9faa3961;hp=5e3097e1d71f6b255f928d512e68675f99b758eb;hpb=090c677210ee2946d99c71412e4ff762bb300f4f;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/llog_test.c b/lustre/obdclass/llog_test.c index 5e3097e..3a839f1 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" }; @@ -81,18 +83,18 @@ static int verify_handle(char *test, struct llog_handle *llh, int num_recs) static int llog_test_1(struct obd_device *obd, char *name) { struct llog_handle *llh; - struct llog_ctxt *ctxt; + struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT); int rc; int rc2; ENTRY; CWARN("1a: create a log with name: %s\n", name); - ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT); LASSERT(ctxt); rc = llog_create(ctxt, &llh, NULL, name); if (rc) { CERROR("1a: llog_create with name %s failed: %d\n", name, rc); + llog_ctxt_put(ctxt); RETURN(rc); } llog_init_handle(llh, LLOG_F_IS_PLAIN, &uuid); @@ -103,6 +105,7 @@ static int llog_test_1(struct obd_device *obd, char *name) out: CWARN("1b: close newly-created log\n"); rc2 = llog_close(llh); + llog_ctxt_put(ctxt); if (rc2) { CERROR("1b: close log %s failed: %d\n", name, rc2); if (rc == 0) @@ -118,26 +121,25 @@ static int llog_test_2(struct obd_device *obd, char *name, struct llog_handle *loghandle; struct llog_logid logid; int rc; - struct llog_ctxt *ctxt; + struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT); ENTRY; - ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT); CWARN("2a: re-open a log with name: %s\n", name); rc = llog_create(ctxt, llh, NULL, name); if (rc) { CERROR("2a: re-open log with name %s failed: %d\n", name, rc); - RETURN(rc); + GOTO(out, rc); } llog_init_handle(*llh, LLOG_F_IS_PLAIN, &uuid); if ((rc = verify_handle("2", *llh, 1))) - RETURN(rc); + GOTO(out, rc); CWARN("2b: create a log without specified NAME & LOGID\n"); rc = llog_create(ctxt, &loghandle, NULL, NULL); if (rc) { CERROR("2b: create log failed\n"); - RETURN(rc); + GOTO(out, rc); } llog_init_handle(loghandle, LLOG_F_IS_PLAIN, &uuid); logid = loghandle->lgh_id; @@ -147,7 +149,7 @@ static int llog_test_2(struct obd_device *obd, char *name, rc = llog_create(ctxt, &loghandle, &logid, NULL); if (rc) { CERROR("2b: re-open log by LOGID failed\n"); - RETURN(rc); + GOTO(out, rc); } llog_init_handle(loghandle, LLOG_F_IS_PLAIN, &uuid); @@ -155,9 +157,11 @@ static int llog_test_2(struct obd_device *obd, char *name, rc = llog_destroy(loghandle); if (rc) { CERROR("2b: destroy log failed\n"); - RETURN(rc); + GOTO(out, rc); } llog_free_handle(loghandle); +out: + llog_ctxt_put(ctxt); RETURN(rc); } @@ -232,13 +236,13 @@ static int llog_test_4(struct obd_device *obd) int rc, i, buflen; struct llog_mini_rec lmr; struct llog_cookie cookie; - struct llog_ctxt *ctxt; + struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT); int num_recs = 0; char *buf; struct llog_rec_hdr rec; + ENTRY; - ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT); lmr.lmr_hdr.lrh_len = lmr.lmr_tail.lrt_len = LLOG_MIN_REC_SIZE; lmr.lmr_hdr.lrh_type = 0xf00f00; @@ -261,10 +265,10 @@ static int llog_test_4(struct obd_device *obd) } num_recs++; if ((rc = verify_handle("4b", cath, 2))) - RETURN(rc); + GOTO(ctxt_release, rc); if ((rc = verify_handle("4b", cath->u.chd.chd_current_log, num_recs))) - RETURN(rc); + GOTO(ctxt_release, rc); CWARN("4c: cancel 1 log record\n"); rc = llog_cat_cancel_records(cath, 1, &cookie); @@ -275,7 +279,7 @@ static int llog_test_4(struct obd_device *obd) num_recs--; if ((rc = verify_handle("4c", cath->u.chd.chd_current_log, num_recs))) - RETURN(rc); + GOTO(ctxt_release, rc); CWARN("4d: write 40,000 more log records\n"); for (i = 0; i < 40000; i++) { @@ -311,6 +315,8 @@ static int llog_test_4(struct obd_device *obd) out: CWARN("4f: put newly-created catalog\n"); rc = llog_cat_put(cath); +ctxt_release: + llog_ctxt_put(ctxt); if (rc) CERROR("1b: close log %s failed: %d\n", name, rc); RETURN(rc); @@ -366,8 +372,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) { @@ -375,10 +379,10 @@ static int llog_test_5(struct obd_device *obd) char name[10]; int rc; struct llog_mini_rec lmr; - struct llog_ctxt *ctxt; + struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT); + ENTRY; - ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT); lmr.lmr_hdr.lrh_len = lmr.lmr_tail.lrt_len = LLOG_MIN_REC_SIZE; lmr.lmr_hdr.lrh_type = 0xf00f00; @@ -391,7 +395,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); @@ -413,7 +417,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); @@ -426,12 +430,21 @@ 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) rc = llog_cat_put(llh); if (rc) CERROR("1b: close log %s failed: %d\n", name, rc); + llog_ctxt_put(ctxt); + RETURN(rc); } @@ -439,8 +452,8 @@ static int llog_test_5(struct obd_device *obd) static int llog_test_6(struct obd_device *obd, char *name) { struct obd_device *mdc_obd; - struct llog_ctxt *ctxt; - struct obd_uuid *mds_uuid; + struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT); + struct obd_uuid *mds_uuid = &ctxt->loc_exp->exp_obd->obd_uuid; struct lustre_handle exph = {0, }; struct obd_export *exp; struct obd_uuid uuid = {"LLOG_TEST6_UUID"}; @@ -448,29 +461,28 @@ static int llog_test_6(struct obd_device *obd, char *name) struct llog_ctxt *nctxt; int rc; - ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT); - mds_uuid = &ctxt->loc_exp->exp_obd->obd_uuid; - CWARN("6a: re-open log %s using client API\n", name); mdc_obd = class_find_client_obd(mds_uuid, LUSTRE_MDC_NAME, NULL); if (mdc_obd == NULL) { CERROR("6: no MDC devices connected to %s found.\n", mds_uuid->uuid); - RETURN(-ENOENT); + GOTO(ctxt_release, rc = -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); + GOTO(ctxt_release, rc); } exp = class_conn2export(&exph); - nctxt = llog_get_context(&mdc_obd->obd_llogs, LLOG_CONFIG_REPL_CTXT); + nctxt = llog_get_context(mdc_obd, LLOG_CONFIG_REPL_CTXT); rc = llog_create(nctxt, &llh, NULL, name); if (rc) { CERROR("6: llog_create failed %d\n", rc); - RETURN(rc); + llog_ctxt_put(nctxt); + GOTO(ctxt_release, rc); } rc = llog_init_handle(llh, LLOG_F_IS_PLAIN, NULL); @@ -479,31 +491,35 @@ 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); + llog_ctxt_put(nctxt); if (rc) { CERROR("6: llog_close failed: rc = %d\n", rc); } - - rc = obd_disconnect(exp, 0); - + rc = obd_disconnect(exp); +ctxt_release: + llog_ctxt_put(ctxt); RETURN(rc); } static int llog_test_7(struct obd_device *obd) { - struct llog_ctxt *ctxt; + struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT); struct llog_handle *llh; struct llog_create_rec lcr; char name[10]; int rc; ENTRY; - ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT); sprintf(name, "%x", llog_test_rand+2); CWARN("7: create a log with name: %s\n", name); LASSERT(ctxt); @@ -511,23 +527,25 @@ static int llog_test_7(struct obd_device *obd) rc = llog_create(ctxt, &llh, NULL, name); if (rc) { CERROR("7: llog_create with name %s failed: %d\n", name, rc); - RETURN(rc); + GOTO(ctxt_release, rc); } 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); - RETURN(rc); + GOTO(ctxt_release, rc); } 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); +ctxt_release: + llog_ctxt_put(ctxt); RETURN(rc); } @@ -537,15 +555,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 llog_ctxt *ctxt; + 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; - ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT); 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) @@ -585,114 +602,109 @@ 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); } - + llog_ctxt_put(ctxt); return rc; } -static int llog_test_llog_init(struct obd_device *obd, struct obd_llogs *llogs, - struct obd_device *tgt, int count, - struct llog_catid *logid) +static int llog_test_llog_init(struct obd_device *obd, int group, + struct obd_device *tgt, int count, + struct llog_catid *logid, struct obd_uuid *uuid) { int rc; ENTRY; - rc = llog_setup(obd, llogs, LLOG_TEST_ORIG_CTXT, tgt, 0, - NULL, &llog_lvfs_ops); + rc = llog_setup(obd, &obd->obd_olg, LLOG_TEST_ORIG_CTXT, tgt, 0, NULL, + &llog_lvfs_ops); RETURN(rc); } -static int llog_test_llog_finish(struct obd_device *obd, - struct obd_llogs *llogs, int count) +static int llog_test_llog_finish(struct obd_device *obd, int count) { int rc; ENTRY; - rc = llog_cleanup(llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT)); + rc = llog_cleanup(llog_get_context(obd, LLOG_TEST_ORIG_CTXT)); RETURN(rc); } +#ifdef LPROCFS +static struct lprocfs_vars lprocfs_llog_test_obd_vars[] = { {0} }; +static struct lprocfs_vars lprocfs_llog_test_module_vars[] = { {0} }; +static void lprocfs_llog_test_init_vars(struct lprocfs_static_vars *lvars) +{ + lvars->module_vars = lprocfs_llog_test_module_vars; + lvars->obd_vars = lprocfs_llog_test_obd_vars; +} +#endif -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, &obd->obd_llogs, 0); + 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, &obd->obd_llogs, tgt, 0, NULL); + rc = obd_llog_init(obd, OBD_LLOG_GROUP, 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); -} + llog_test_cleanup(obd); -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; + lprocfs_llog_test_init_vars(&lvars); + lprocfs_obd_setup(obd, lvars.obd_vars); - lprocfs_init_vars(ost, &lvars); - return lprocfs_obd_attach(dev, 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, }; -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) - 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, NULL, lvars.module_vars, - "llog_test"); + lprocfs_llog_test_init_vars(&lvars); + return class_register_type(&llog_obd_ops, NULL, + lvars.module_vars,"llog_test", NULL); } static void __exit llog_test_exit(void)