b=3031

[fs/lustre-release.git] / lustre / obdclass / llog_test.c

diff --git a/lustre/obdclass/llog_test.c b/lustre/obdclass/llog_test.c
index 5e3097e..18efa90 100644 (file)
--- a/lustre/obdclass/llog_test.c
+++ b/lustre/obdclass/llog_test.c
@@ -90,9 +90,9 @@ static int llog_test_1(struct obd_device *obd, char *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);
@@ -123,7 +123,7 @@ static int llog_test_2(struct obd_device *obd, char *name,
 
         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);
@@ -134,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);
@@ -144,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);
@@ -244,9 +244,9 @@ static int llog_test_4(struct obd_device *obd)
 
         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);
@@ -254,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);
@@ -279,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);
@@ -297,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);
@@ -366,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)
 {
@@ -383,9 +381,9 @@ static int llog_test_5(struct obd_device *obd)
         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);
@@ -405,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");
@@ -426,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)
@@ -459,7 +465,7 @@ 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);
@@ -467,9 +473,9 @@ static int llog_test_6(struct obd_device *obd, char *name)
         exp = class_conn2export(&exph);
 
         nctxt = llog_get_context(&mdc_obd->obd_llogs, LLOG_CONFIG_REPL_CTXT);
-        rc = llog_create(nctxt, &llh, NULL, name);
+        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);
         }
 
@@ -483,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) {
@@ -508,9 +518,9 @@ static int llog_test_7(struct obd_device *obd)
         CWARN("7: create a log with name: %s\n", name);
         LASSERT(ctxt);
 
-        rc = llog_create(ctxt, &llh, NULL, name);
+        rc = llog_open(ctxt, &llh, NULL, name, OBD_LLOG_FL_CREATE);
         if (rc) {
-                CERROR("7: llog_create with name %s failed: %d\n", name, rc);
+                CERROR("7: llog_open with name %s failed: %d\n", name, rc);
                 RETURN(rc);
         }
         llog_init_handle(llh, LLOG_F_IS_PLAIN, &uuid);
@@ -536,16 +546,16 @@ 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 llog_handle *llh;
+        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)
@@ -585,7 +595,7 @@ 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;
@@ -599,8 +609,8 @@ static int llog_test_llog_init(struct obd_device *obd, struct obd_llogs *llogs,
         int rc;
         ENTRY;
 
-        rc = llog_setup(obd, llogs, 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);
 }
 
@@ -610,7 +620,7 @@ static int llog_test_llog_finish(struct obd_device *obd,
         int rc;
         ENTRY;
 
-        rc = llog_cleanup(llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT));
+        rc = obd_llog_cleanup(llog_get_context(llogs, LLOG_TEST_ORIG_CTXT));
         RETURN(rc);
 }
 
@@ -651,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);
 }
 
@@ -672,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} };
@@ -691,7 +697,9 @@ 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,
+       
+        return class_register_type(&llog_obd_ops, NULL, 
+                                  lvars.module_vars,
                                    "llog_test");
 }