From 31db8f9cf048ef93477951e12a166722e777a2da Mon Sep 17 00:00:00 2001 From: Alex Zhuravlev Date: Fri, 12 Oct 2012 12:16:54 +0400 Subject: [PATCH] LU-2156 misc: too noisy messages are suppressed - number of messages leading to confusion and adding no useful information to the customers are suppressed. - remove KEY_REVIMP_UPD - it's not used with OFD Signed-off-by: Alex Zhuravlev Change-Id: I9679b786354a2f4b52c5c13e0e2ec98a5a5b86a9 Reviewed-on: http://review.whamcloud.com/4261 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Mike Pershin Reviewed-by: Prakash Surya --- lustre/include/obd.h | 1 - lustre/ldlm/ldlm_lib.c | 6 +----- lustre/ldlm/ldlm_request.c | 8 +++++--- lustre/mgc/mgc_request.c | 2 +- lustre/obdclass/obd_mount.c | 3 ++- lustre/ofd/ofd_fs.c | 2 +- lustre/osp/osp_dev.c | 6 +++++- lustre/ptlrpc/sec_config.c | 4 +--- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lustre/include/obd.h b/lustre/include/obd.h index a3765db..9a30876 100644 --- a/lustre/include/obd.h +++ b/lustre/include/obd.h @@ -1182,7 +1182,6 @@ enum obd_cleanup_stage { #define KEY_NEXT_ID "next_id" #define KEY_READ_ONLY "read-only" #define KEY_REGISTER_TARGET "register_target" -#define KEY_REVIMP_UPD "revimp_update" #define KEY_SET_FS "set_fs" #define KEY_TGT_COUNT "tgt_count" /* KEY_SET_INFO in lustre_idl.h */ diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c index 9313687..3e3660f 100644 --- a/lustre/ldlm/ldlm_lib.c +++ b/lustre/ldlm/ldlm_lib.c @@ -1221,13 +1221,9 @@ dont_check_exports: } cfs_spin_lock(&export->exp_lock); - if (export->exp_imp_reverse != NULL) { + if (export->exp_imp_reverse != NULL) /* destroyed import can be still referenced in ctxt */ - obd_set_info_async(req->rq_svc_thread->t_env, export, - sizeof(KEY_REVIMP_UPD), KEY_REVIMP_UPD, - 0, NULL, NULL); tmp_imp = export->exp_imp_reverse; - } export->exp_imp_reverse = revimp; cfs_spin_unlock(&export->exp_lock); diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c index 86023cd..64dc539 100644 --- a/lustre/ldlm/ldlm_request.c +++ b/lustre/ldlm/ldlm_request.c @@ -1179,8 +1179,9 @@ int ldlm_cli_cancel_req(struct obd_export *exp, cfs_list_t *cancels, ptlrpc_req_finished(req); continue; } else if (rc != ELDLM_OK) { - CERROR("Got rc %d from cancel RPC: canceling " - "anyway\n", rc); + if (rc != -ESHUTDOWN) + CERROR("Got rc %d from cancel RPC: canceling " + "anyway\n", rc); break; } sent = count; @@ -1812,7 +1813,8 @@ int ldlm_cli_cancel_list(cfs_list_t *cancels, int count, } if (res < 0) { - CERROR("ldlm_cli_cancel_list: %d\n", res); + if (res != -ESHUTDOWN) + CERROR("ldlm_cli_cancel_list: %d\n", res); res = count; } diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c index 80d1ac7..bf02e4e 100644 --- a/lustre/mgc/mgc_request.c +++ b/lustre/mgc/mgc_request.c @@ -244,7 +244,7 @@ struct config_llog_data *do_config_log_add(struct obd_device *obd, if (cld_is_sptlrpc(cld)) { rc = mgc_process_log(obd, cld); - if (rc) + if (rc && rc != -ENOENT) CERROR("failed processing sptlrpc log: %d\n", rc); } diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c index f856cba..ea465c8 100644 --- a/lustre/obdclass/obd_mount.c +++ b/lustre/obdclass/obd_mount.c @@ -1595,7 +1595,8 @@ static int server_lsi2mti(struct lustre_sb_info *lsi, LASSERT(!(rc & LDD_F_NEED_INDEX)); /* keep only LDD flags */ mti->mti_flags = lsi->lsi_flags & LDD_F_MASK; - mti->mti_flags |= LDD_F_UPDATE; + if (mti->mti_flags & (LDD_F_WRITECONF | LDD_F_VIRGIN)) + mti->mti_flags |= LDD_F_UPDATE; strncpy(mti->mti_params, lsi->lsi_lmd->lmd_params, sizeof(mti->mti_params)); return 0; diff --git a/lustre/ofd/ofd_fs.c b/lustre/ofd/ofd_fs.c index 45c46cc..758f4a2 100644 --- a/lustre/ofd/ofd_fs.c +++ b/lustre/ofd/ofd_fs.c @@ -267,7 +267,7 @@ int ofd_groups_init(const struct lu_env *env, struct ofd_device *ofd) } } - CWARN("%s: %u groups initialized\n", + CDEBUG(D_OTHER, "%s: %u groups initialized\n", ofd_obd(ofd)->obd_name, ofd->ofd_max_group + 1); cleanup: RETURN(rc); diff --git a/lustre/osp/osp_dev.c b/lustre/osp/osp_dev.c index 0b463b7..94f4d3f 100644 --- a/lustre/osp/osp_dev.c +++ b/lustre/osp/osp_dev.c @@ -212,7 +212,9 @@ int osp_disconnect(struct osp_device *d) (void)ptlrpc_pinger_del_import(imp); rc = ptlrpc_disconnect_import(imp, 0); - if (rc && rc != -ETIMEDOUT) + if (rc == -ETIMEDOUT || rc == -ENOTCONN || rc == -ESHUTDOWN) + rc = 0; + if (rc) CERROR("%s: can't disconnect: rc = %d\n", d->opd_obd->obd_name, rc); @@ -838,6 +840,8 @@ static int osp_import_event(struct obd_device *obd, struct obd_import *imp, ldlm_namespace_cleanup(obd->obd_namespace, LDLM_FL_LOCAL_ONLY); break; case IMP_EVENT_OCD: + case IMP_EVENT_DEACTIVATE: + case IMP_EVENT_ACTIVATE: break; default: CERROR("%s: unsupported import event: %#x\n", diff --git a/lustre/ptlrpc/sec_config.c b/lustre/ptlrpc/sec_config.c index 6da9d20..3f4698d 100644 --- a/lustre/ptlrpc/sec_config.c +++ b/lustre/ptlrpc/sec_config.c @@ -1020,10 +1020,8 @@ int sptlrpc_target_local_copy_conf(struct obd_device *obd, ENTRY; ctxt = llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT); - if (ctxt == NULL) { - CERROR("missing llog context\n"); + if (ctxt == NULL) RETURN(-EINVAL); - } push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); -- 1.8.3.1