commit 48ecca7e06b1fbf85ad9f9b6f108e757ed80a2bd Author: Wang Di Date: Fri May 4 14:58:28 2012 -0700 ORI-654: add some error msg for setup process. Add some error in the setup process, so we can know why the setup fails. Signed-off-by: Wang Di Change-Id: Iae875d2818a8db8f80bb252a3078091a0092bf5f diff --git a/lustre/mdd/mdd_device.c b/lustre/mdd/mdd_device.c index fc6d8af..be20eba 100644 --- a/lustre/mdd/mdd_device.c +++ b/lustre/mdd/mdd_device.c @@ -1234,13 +1234,23 @@ static int mdd_start(const struct lu_env *env, lu_local_obj_fid(&fid, MDD_ROOT_INDEX_OID); mdo = mdd_open_index_internal(env, mdd, &pfid, mdd_root_dir_name, &fid); - if (IS_ERR(mdo)) + if (IS_ERR(mdo)) { + rc = PTR_ERR(mdo); + CERROR("%s: mdd open index failed: rc = %d\n", + mdd2obd_dev(mdd)->obd_name, rc); RETURN(PTR_ERR(mdo)); + } mdd_object_put(env, mdo); mdd->mdd_root_fid = fid; rc = orph_index_init(env, mdd); + if (rc) { + CERROR("%s: orph index init error: rc = %d\n", + mdd2obd_dev(mdd)->obd_name, rc); + GOTO(out, rc); + } + if (rc) GOTO(out, rc); diff --git a/lustre/mdd/mdd_orphans.c b/lustre/mdd/mdd_orphans.c index 15e3873..c81a506 100644 --- a/lustre/mdd/mdd_orphans.c +++ b/lustre/mdd/mdd_orphans.c @@ -439,8 +439,12 @@ int orph_index_init(const struct lu_env *env, struct mdd_device *mdd) lu_local_obj_fid(&fid, MDD_ORPHAN_OID); mdo = mdd_open_index_internal(env, mdd, &pfid, orph_index_name, &fid); - if (IS_ERR(mdo)) - RETURN(PTR_ERR(mdo)); + if (IS_ERR(mdo)) { + rc = PTR_ERR(mdo); + CERROR("%s:open %s error: rc = %d\n", + mdd2obd_dev(mdd)->obd_name, orph_index_name, rc); + RETURN(rc); + } mdd->mdd_orphans = mdo; if (!dt_try_as_dir(env, mdd_object_child(mdd->mdd_orphans))) { diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c index 859266e..f827f96 100644 --- a/lustre/mdt/mdt_handler.c +++ b/lustre/mdt/mdt_handler.c @@ -4969,12 +4969,18 @@ static int mdt_start(const struct lu_env *env, struct lu_device *dev) child_lu_dev = &mdt->mdt_child->md_lu_dev; rc = child_lu_dev->ld_ops->ldo_start(env, child_lu_dev); - if (rc) + if (rc) { + CERROR("%s: mdt start failed: rc = %d\n", + mdt2obd_dev(mdt)->obd_name, rc); GOTO(out, rc); + } rc = mdt_changelog_init(env, mdt); - if (rc) + if (rc) { + CERROR("%s: mdt changelog init: rc = %d\n", + mdt2obd_dev(mdt)->obd_name, rc); GOTO(out, rc); + } LASSERT(!cfs_test_bit(MDT_FL_CFGLOG, &mdt->mdt_state)); target_recovery_init(&mdt->mdt_lut, mdt_recovery_handle); diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c index 778a2a9..502e38a 100644 --- a/lustre/obdclass/obd_mount.c +++ b/lustre/obdclass/obd_mount.c @@ -810,6 +810,8 @@ static int server_lsi2mti(struct lustre_sb_info *lsi, rc = server_name2index(lsi->lsi_svname, &mti->mti_stripe_index, NULL); if (rc < 0) return rc; + + strncpy(mti->mti_svname, lsi->lsi_svname, sizeof(mti->mti_svname)); /* Orion requires index to be set */ LASSERT(!(rc & LDD_F_NEED_INDEX)); /* keep only LDD flags */ @@ -997,7 +999,12 @@ static int server_start_targets(struct lustre_sb_info *lsi) obd->obd_self_export, 0, NULL, NULL); } - server_notify_target(lsi, obd); + rc = server_notify_target(lsi, obd); + if (rc != 0) { + CERROR("%s: failed to notify the target: rc = %d\n", + lsi->lsi_svname, rc); + RETURN(rc); + } /* calculate recovery timeout, do it after lustre_process_log */ server_calc_timeout(lsi, obd); @@ -1012,7 +1019,7 @@ static int server_start_targets(struct lustre_sb_info *lsi) lu_context_enter(&session_ctx); env.le_ses = &session_ctx; - obd->obd_lu_dev->ld_ops->ldo_start(&env, obd->obd_lu_dev); + rc = obd->obd_lu_dev->ld_ops->ldo_start(&env, obd->obd_lu_dev); lu_env_fini(&env); lu_context_exit(&session_ctx);