From: yangsheng Date: Mon, 26 Mar 2012 17:09:15 +0000 (+0800) Subject: LU-458 debug: quiet too noisy console messages at mount X-Git-Tag: v1_8_8_WC1_RC1~2 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=85712433bbc076367456e116a6442446530af1af;p=fs%2Flustre-release.git LU-458 debug: quiet too noisy console messages at mount Quiet a number of extra debug messages printed to the console after a remount or recovery. They provide no value and just add to the general confusion of reading Lustre debug messages. Signed-off-by: yang sheng Change-Id: I5d5352d55d5a91f9fd4c55d077eebf1fdab61f80 Reviewed-on: http://review.whamcloud.com/2381 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Johann Lombardi --- diff --git a/ldiskfs/kernel_patches/patches/ext4-dynlocks-common.patch b/ldiskfs/kernel_patches/patches/ext4-dynlocks-common.patch index e360662..8b7790f 100644 --- a/ldiskfs/kernel_patches/patches/ext4-dynlocks-common.patch +++ b/ldiskfs/kernel_patches/patches/ext4-dynlocks-common.patch @@ -52,7 +52,7 @@ diff -rupN linux-2.6.18-128.1.6_1/fs/ext4/dynlocks.c linux-2.6.18-128.1.6_2/fs/e + +void __exit dynlock_cache_exit(void) +{ -+ printk(KERN_INFO "exit dynlocks cache\n"); ++ /* printk(KERN_INFO "exit dynlocks cache\n"); */ + kmem_cache_destroy(dynlock_cachep); +} + diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c index 21746fb..bd6e57e 100644 --- a/lnet/klnds/o2iblnd/o2iblnd.c +++ b/lnet/klnds/o2iblnd/o2iblnd.c @@ -2203,9 +2203,10 @@ kiblnd_dev_setup(kib_dev_t *ibdev) } out: - CDEBUG(D_CONSOLE, "Register global MR array, MR size: " - LPX64", array size: %d\n", - ibdev->ibd_mr_size, ibdev->ibd_nmrs); + if (ibdev->ibd_mr_size != ~0ULL || ibdev->ibd_nmrs != 1) + LCONSOLE_INFO("Register global MR array, MR size: " + LPX64", array size: %d\n", + ibdev->ibd_mr_size, ibdev->ibd_nmrs); list_add_tail(&ibdev->ibd_list, &kiblnd_data.kib_devs); diff --git a/lnet/lnet/acceptor.c b/lnet/lnet/acceptor.c index efc4e12..91e78b6 100644 --- a/lnet/lnet/acceptor.c +++ b/lnet/lnet/acceptor.c @@ -777,7 +777,7 @@ lnet_acceptor(void *arg) } close(lnet_acceptor_state.pta_sock); - LCONSOLE(0,"Acceptor stopping\n"); + CDEBUG(D_NET, "Acceptor stopping\n"); /* unblock lnet_acceptor_stop() */ cfs_complete(&lnet_acceptor_state.pta_completion); diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c index 442599c..134534e 100644 --- a/lustre/ldlm/ldlm_lib.c +++ b/lustre/ldlm/ldlm_lib.c @@ -697,7 +697,7 @@ int target_handle_connect(struct ptlrpc_request *req, svc_handler_t handler) if (!target || target->obd_stopping || !target->obd_set_up) { LCONSOLE_ERROR_MSG(0x137, "UUID '%s' is not available " - " for connect (%s)\n", str, + "for connect (%s)\n", str, !target ? "no target" : (target->obd_stopping ? "stopping" : "not set up")); diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index 6a93def..f540634 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -1173,7 +1173,7 @@ out_free: if (err) ll_put_super(sb); else - LCONSOLE_WARN("Client %s has started\n", profilenm); + LCONSOLE_WARN("Client %s(%p) mount complete\n", profilenm, sb); RETURN(err); } /* ll_fill_super */ @@ -1237,7 +1237,7 @@ void ll_put_super(struct super_block *sb) lustre_common_put_super(sb); - LCONSOLE_WARN("client %s umount complete\n", ll_instance); + LCONSOLE_WARN("client %s(%p) umount complete\n", profilenm, sb); cfs_module_put(); diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c index 5ee979c..1aa8681 100644 --- a/lustre/obdclass/class_obd.c +++ b/lustre/obdclass/class_obd.c @@ -516,13 +516,7 @@ int init_obdclass(void) int lustre_register_fs(void); #endif -#ifdef CRAY_XT3 printk(KERN_INFO "Lustre: Build Version: "BUILD_VERSION"\n"); -#else - LCONSOLE_INFO("OBD class driver, http://wiki.whamcloud.com/\n"); - LCONSOLE_INFO(" Lustre Version: "LUSTRE_VERSION_STRING"\n"); - LCONSOLE_INFO(" Build Version: "BUILD_VERSION"\n"); -#endif spin_lock_init(&obd_types_lock); cfs_waitq_init(&obd_race_waitq); diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c index ca785a1..828475c 100644 --- a/lustre/obdfilter/filter.c +++ b/lustre/obdfilter/filter.c @@ -1162,7 +1162,7 @@ static int filter_prep_groups(struct obd_device *obd) rc = fsfilt_read_record(obd, filp, &filter->fo_last_objids[i], sizeof(__u64), &off); if (rc) { - CDEBUG(D_INODE,"OBD filter: error reading %s: rc %d\n", + CERROR("OBD filter: error reading %s: rc %d\n", name, rc); GOTO(cleanup, rc); } diff --git a/lustre/ptlrpc/niobuf.c b/lustre/ptlrpc/niobuf.c index cf5d752..ff06df8 100644 --- a/lustre/ptlrpc/niobuf.c +++ b/lustre/ptlrpc/niobuf.c @@ -473,7 +473,9 @@ int ptlrpc_send_error(struct ptlrpc_request *req, int may_be_difficult) RETURN(rc); } - req->rq_type = PTL_RPC_MSG_ERR; + if (req->rq_status != -ENOSPC && req->rq_status != -EACCES && + req->rq_status != -EPERM) + req->rq_type = PTL_RPC_MSG_ERR; rc = ptlrpc_send_reply(req, may_be_difficult); RETURN(rc);