X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_test.c;h=18efa90accbe5cfd2438adaa58586a5e4d2e1cdd;hb=0fbdddacf4c105ed10196a672fd51255c176f5ee;hp=f8e6de1bd59634c333bc919814d3af17b735f41e;hpb=ff17cc7e0282d9b1522810e0c5d12171c4d46a2d;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/llog_test.c b/lustre/obdclass/llog_test.c index f8e6de1..18efa90 100644 --- a/lustre/obdclass/llog_test.c +++ b/lustre/obdclass/llog_test.c @@ -81,17 +81,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 = llog_get_context(obd, LLOG_TEST_ORIG_CTXT); + struct llog_ctxt *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); + rc = llog_open(ctxt, &llh, NULL, name, OBD_LLOG_FL_CREATE); if (rc) { - CERROR("1a: llog_create with name %s failed: %d\n", name, rc); + CERROR("1a: llog_open with name %s failed: %d\n", name, rc); RETURN(rc); } llog_init_handle(llh, LLOG_F_IS_PLAIN, &uuid); @@ -117,11 +118,12 @@ 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 = llog_get_context(obd, LLOG_TEST_ORIG_CTXT); + struct llog_ctxt *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); + rc = llog_open(ctxt, llh, NULL, name, 0); if (rc) { CERROR("2a: re-open log with name %s failed: %d\n", name, rc); RETURN(rc); @@ -132,7 +134,7 @@ static int llog_test_2(struct obd_device *obd, char *name, RETURN(rc); CWARN("2b: create a log without specified NAME & LOGID\n"); - rc = llog_create(ctxt, &loghandle, NULL, NULL); + rc = llog_open(ctxt, &loghandle, NULL, NULL, OBD_LLOG_FL_CREATE); if (rc) { CERROR("2b: create log failed\n"); RETURN(rc); @@ -142,7 +144,7 @@ static int llog_test_2(struct obd_device *obd, char *name, llog_close(loghandle); CWARN("2b: re-open the log by LOGID\n"); - rc = llog_create(ctxt, &loghandle, &logid, NULL); + rc = llog_open(ctxt, &loghandle, &logid, NULL, 0); if (rc) { CERROR("2b: re-open log by LOGID failed\n"); RETURN(rc); @@ -230,21 +232,21 @@ 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 = llog_get_context(obd, LLOG_TEST_ORIG_CTXT); + struct llog_ctxt *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; sprintf(name, "%x", llog_test_rand+1); CWARN("4a: create a catalog log with name: %s\n", name); - rc = llog_create(ctxt, &cath, NULL, name); + rc = llog_open(ctxt, &cath, NULL, name, OBD_LLOG_FL_CREATE); if (rc) { - CERROR("1a: llog_create with name %s failed: %d\n", name, rc); + CERROR("1a: llog_open with name %s failed: %d\n", name, rc); GOTO(out, rc); } llog_init_handle(cath, LLOG_F_IS_CAT, &uuid); @@ -252,7 +254,7 @@ static int llog_test_4(struct obd_device *obd) cat_logid = cath->lgh_id; CWARN("4b: write 1 record into the catalog\n"); - rc = llog_cat_add_rec(cath, &lmr.lmr_hdr, &cookie, NULL); + rc = llog_cat_add_rec(cath, &lmr.lmr_hdr, &cookie, NULL, NULL, NULL); if (rc != 1) { CERROR("4b: write 1 catalog record failed at: %d\n", rc); GOTO(out, rc); @@ -277,7 +279,7 @@ static int llog_test_4(struct obd_device *obd) CWARN("4d: write 40,000 more log records\n"); for (i = 0; i < 40000; i++) { - rc = llog_cat_add_rec(cath, &lmr.lmr_hdr, NULL, NULL); + rc = llog_cat_add_rec(cath, &lmr.lmr_hdr, NULL, NULL, NULL, NULL); if (rc) { CERROR("4d: write 40000 records failed at #%d: %d\n", i + 1, rc); @@ -295,7 +297,7 @@ static int llog_test_4(struct obd_device *obd) for (i = 0; i < 5; i++) { rec.lrh_len = buflen; rec.lrh_type = OBD_CFG_REC; - rc = llog_cat_add_rec(cath, &rec, NULL, buf); + rc = llog_cat_add_rec(cath, &rec, NULL, buf, NULL, NULL); if (rc) { CERROR("4e: write 5 records failed at #%d: %d\n", i + 1, rc); @@ -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) { @@ -373,17 +373,17 @@ static int llog_test_5(struct obd_device *obd) char name[10]; int rc; struct llog_mini_rec lmr; - struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT); - + struct llog_ctxt *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; CWARN("5a: re-open catalog by id\n"); - rc = llog_create(ctxt, &llh, &cat_logid, NULL); + rc = llog_open(ctxt, &llh, &cat_logid, NULL, 0); if (rc) { - CERROR("5a: llog_create with logid failed: %d\n", rc); + CERROR("5a: llog_open with logid failed: %d\n", rc); GOTO(out, rc); } llog_init_handle(llh, LLOG_F_IS_CAT, &uuid); @@ -403,7 +403,7 @@ static int llog_test_5(struct obd_device *obd) } CWARN("5d: add 1 record to the log with many canceled empty pages\n"); - rc = llog_cat_add_rec(llh, &lmr.lmr_hdr, NULL, NULL); + rc = llog_cat_add_rec(llh, &lmr.lmr_hdr, NULL, NULL, NULL, NULL); if (rc) { CERROR("5d: add record to the log with many canceled empty\ pages failed\n"); @@ -424,6 +424,14 @@ 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) @@ -437,8 +445,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 = llog_get_context(obd, LLOG_TEST_ORIG_CTXT); - struct obd_uuid *mds_uuid = &ctxt->loc_exp->exp_obd->obd_uuid; + struct llog_ctxt *ctxt; + struct obd_uuid *mds_uuid; struct lustre_handle exph = {0, }; struct obd_export *exp; struct obd_uuid uuid = {"LLOG_TEST6_UUID"}; @@ -446,6 +454,9 @@ 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) { @@ -454,17 +465,17 @@ static int llog_test_6(struct obd_device *obd, char *name) RETURN(-ENOENT); } - rc = obd_connect(&exph, mdc_obd, &uuid); + rc = obd_connect(&exph, mdc_obd, &uuid, NULL, 0); if (rc) { CERROR("6: failed to connect to MDC: %s\n", mdc_obd->obd_name); RETURN(rc); } exp = class_conn2export(&exph); - nctxt = llog_get_context(mdc_obd, LLOG_CONFIG_REPL_CTXT); - rc = llog_create(nctxt, &llh, NULL, name); + nctxt = llog_get_context(&mdc_obd->obd_llogs, LLOG_CONFIG_REPL_CTXT); + rc = llog_open(nctxt, &llh, NULL, name, 0); if (rc) { - CERROR("6: llog_create failed %d\n", rc); + CERROR("6: llog_open failed %d\n", rc); RETURN(rc); } @@ -478,6 +489,10 @@ static int llog_test_6(struct obd_device *obd, char *name) if (rc) CERROR("6: llog_process failed %d\n", rc); + rc = llog_reverse_process(llh, (llog_cb_t)plain_print_cb, NULL, NULL); + if (rc) + CERROR("6: llog_reverse_process failed %d\n", rc); + parse_out: rc = llog_close(llh); if (rc) { @@ -489,20 +504,58 @@ parse_out: RETURN(rc); } +static int llog_test_7(struct obd_device *obd) +{ + struct llog_ctxt *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); + + rc = llog_open(ctxt, &llh, NULL, name, OBD_LLOG_FL_CREATE); + if (rc) { + CERROR("7: llog_open with name %s failed: %d\n", name, rc); + RETURN(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); + 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); + } + + rc = llog_destroy(llh); + if (rc) + CERROR("7: llog_destroy failed: %d\n", rc); + else + llog_free_handle(llh); + RETURN(rc); +} + /* ------------------------------------------------------------------------- * Tests above, boring obd functions below * ------------------------------------------------------------------------- */ static int llog_run_tests(struct obd_device *obd) { + struct llog_ctxt *ctxt; struct llog_handle *llh; - struct obd_run_ctxt saved; - struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT); + struct lvfs_run_ctxt saved; 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) @@ -529,6 +582,10 @@ static int llog_run_tests(struct obd_device *obd) if (rc) GOTO(cleanup, rc); + rc = llog_test_7(obd); + if (rc) + GOTO(cleanup, rc); + cleanup: switch (cleanup_phase) { case 1: @@ -538,35 +595,38 @@ 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) { int rc; ENTRY; - rc = llog_setup(obd, LLOG_TEST_ORIG_CTXT, tgt, 0, NULL, &llog_lvfs_ops); + rc = obd_llog_setup(obd, llogs, LLOG_TEST_ORIG_CTXT, tgt, 0, NULL, + &llog_lvfs_ops); RETURN(rc); } -static int llog_test_llog_finish(struct obd_device *obd, int count) +static int llog_test_llog_finish(struct obd_device *obd, + struct obd_llogs *llogs, int count) { int rc; ENTRY; - rc = llog_cleanup(llog_get_context(obd, LLOG_TEST_ORIG_CTXT)); + rc = obd_llog_cleanup(llog_get_context(llogs, LLOG_TEST_ORIG_CTXT)); RETURN(rc); } static int llog_test_cleanup(struct obd_device *obd, int flags) { - int rc = obd_llog_finish(obd, 0); + int rc = obd_llog_finish(obd, &obd->obd_llogs, 0); if (rc) CERROR("failed to llog_test_llog_finish: %d\n", rc); @@ -592,7 +652,7 @@ static int llog_test_setup(struct obd_device *obd, obd_count len, void *buf) RETURN(-EINVAL); } - rc = obd_llog_init(obd, tgt, 0, NULL); + rc = obd_llog_init(obd, &obd->obd_llogs, tgt, 0, NULL); if (rc) RETURN(rc); @@ -601,18 +661,15 @@ static int llog_test_setup(struct obd_device *obd, obd_count len, void *buf) 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; - lprocfs_init_vars(ost, &lvars); + lprocfs_init_vars(llog_test, &lvars); return lprocfs_obd_attach(dev, lvars.obd_vars); } @@ -622,14 +679,13 @@ static int llog_test_detach(struct obd_device *dev) } 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_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, }; static struct lprocfs_vars lprocfs_obd_vars[] = { {0} }; @@ -641,7 +697,10 @@ 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"); } static void __exit llog_test_exit(void)