Whamcloud - gitweb
LU-459 quiet too noisy console messages at mount
authorAndreas Dilger <adilger@whamcloud.com>
Mon, 22 Aug 2011 22:56:45 +0000 (16:56 -0600)
committerOleg Drokin <green@whamcloud.com>
Wed, 5 Oct 2011 08:34:13 +0000 (04:34 -0400)
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.

Change-Id: Ia0b43bbd337501169dec234ff66dd56f67f75131
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-on: http://review.whamcloud.com/1275
Tested-by: Hudson
Reviewed-by: Jinshan Xiong <jay@whamcloud.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
ldiskfs/kernel_patches/patches/ext4-dynlocks-common-rhel6.patch
ldiskfs/kernel_patches/patches/ext4-dynlocks-common-sles11.patch
ldiskfs/kernel_patches/patches/ext4-dynlocks-common.patch
lnet/klnds/o2iblnd/o2iblnd.c
lnet/lnet/acceptor.c
lustre/ldlm/ldlm_lib.c
lustre/obdclass/class_obd.c
lustre/obdclass/lu_object.c
lustre/obdfilter/filter.c
lustre/ptlrpc/sec.c

index 17ed593..628c3bc 100644 (file)
@@ -38,7 +38,7 @@ Index: linux-stage/fs/ext4/dynlocks.c
 +{
 +      int rc = 0;
 +
-+      printk(KERN_INFO "init dynlocks cache\n");
++      /* printk(KERN_INFO "init dynlocks cache\n"); */
 +      dynlock_cachep = kmem_cache_create("dynlock_cache",
 +                                       sizeof(struct dynlock_handle),
 +                                       0,
@@ -53,7 +53,7 @@ Index: linux-stage/fs/ext4/dynlocks.c
 +
 +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);
 +}
 +
index 34dc2c8..97e92d2 100644 (file)
@@ -39,7 +39,7 @@ diff -rupN 2.6.27.21/fs/ext4/dynlocks.c 2.6.27.21_1//fs/ext4/dynlocks.c
 +{
 +      int rc = 0;
 +
-+      printk(KERN_INFO "init dynlocks cache\n");
++      /* printk(KERN_INFO "init dynlocks cache\n"); */
 +      dynlock_cachep = kmem_cache_create("dynlock_cache",
 +                                       sizeof(struct dynlock_handle),
 +                                       0,
@@ -54,7 +54,7 @@ diff -rupN 2.6.27.21/fs/ext4/dynlocks.c 2.6.27.21_1//fs/ext4/dynlocks.c
 +
 +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);
 +}
 +
index e360662..d2c9cb2 100644 (file)
@@ -37,7 +37,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
 +{
 +      int rc = 0;
 +
-+      printk(KERN_INFO "init dynlocks cache\n");
++      /* printk(KERN_INFO "init dynlocks cache\n"); */
 +      dynlock_cachep = kmem_cache_create("dynlock_cache",
 +                                       sizeof(struct dynlock_handle),
 +                                       0,
@@ -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);
 +}
 +
index 4959aba..3858118 100644 (file)
@@ -2348,9 +2348,10 @@ kiblnd_hdev_setup_mrs(kib_hca_dev_t *hdev)
         }
 
 out:
-        CDEBUG(D_CONSOLE, "Register global MR array, MR size: "
-                          LPX64", array size: %d\n",
-                          hdev->ibh_mr_size, hdev->ibh_nmrs);
+        if (hdev->ibh_mr_size != ~0ULL || hdev->ibh_nmrs != 1)
+                LCONSOLE_INFO("Register global MR array, MR size: "
+                              LPX64", array size: %d\n",
+                              hdev->ibh_mr_size, hdev->ibh_nmrs);
         return 0;
 }
 
index 200a2f9..d70d20c 100644 (file)
@@ -487,7 +487,7 @@ lnet_acceptor(void *arg)
         libcfs_sock_release(lnet_acceptor_state.pta_sock);
         lnet_acceptor_state.pta_sock = NULL;
 
-        LCONSOLE(0, "Acceptor stopping\n");
+        CDEBUG(D_NET, "Acceptor stopping\n");
 
         /* unblock lnet_acceptor_stop() */
         cfs_mt_complete(&lnet_acceptor_state.pta_signal);
index 366ac15..bfde12a 100644 (file)
@@ -710,7 +710,7 @@ int target_handle_connect(struct ptlrpc_request *req)
 
         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"));
@@ -1769,7 +1769,7 @@ static int target_recovery_thread(void *arg)
         env.le_ctx.lc_thread = thread;
         thread->t_data = NULL;
 
-        CERROR("%s: started recovery thread pid %d\n", obd->obd_name,
+        CDEBUG(D_HA, "%s: started recovery thread pid %d\n", obd->obd_name,
                cfs_curproc_pid());
         trd->trd_processing_task = cfs_curproc_pid();
 
index e344148..df41bc5 100644 (file)
@@ -489,13 +489,7 @@ int init_obdclass(void)
                 CFS_INIT_LIST_HEAD(&capa_list[i]);
 #endif
 
-#ifdef CRAY_XT3
         LCONSOLE_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
 
         cfs_spin_lock_init(&obd_types_lock);
         obd_zombie_impexp_init();
index 8c49f8c..f143f9b 100644 (file)
@@ -1756,7 +1756,7 @@ int lu_global_init(void)
 {
         int result;
 
-        CDEBUG(D_CONSOLE, "Lustre LU module (%p).\n", &lu_keys);
+        CDEBUG(D_INFO, "Lustre LU module (%p).\n", &lu_keys);
 
         result = lu_ref_global_init();
         if (result != 0)
index ba5cca5..54907db 100644 (file)
@@ -1210,10 +1210,10 @@ static int filter_prep_groups(struct obd_device *obd)
 
         O_dentry = simple_mkdir(cfs_fs_pwd(current->fs), obd->u.obt.obt_vfsmnt,
                                 "O", 0700, 1);
-        CDEBUG(D_INODE, "got/created O: %p\n", O_dentry);
+        CDEBUG(D_INODE, "%s: got/created O: %p\n", obd->obd_name, O_dentry);
         if (IS_ERR(O_dentry)) {
                 rc = PTR_ERR(O_dentry);
-                CERROR("cannot open/create O: rc = %d\n", rc);
+                CERROR("%s: cannot open/create O: rc = %d\n", obd->obd_name,rc);
                 GOTO(cleanup, rc);
         }
         filter->fo_dentry_O = O_dentry;
@@ -1223,22 +1223,24 @@ static int filter_prep_groups(struct obd_device *obd)
          * clients because they may send create/destroy for any group -bzzz */
         filp = filp_open("LAST_GROUP", O_CREAT | O_RDWR, 0700);
         if (IS_ERR(filp)) {
-                CERROR("cannot create LAST_GROUP: rc = %ld\n", PTR_ERR(filp));
+                CERROR("%s: cannot create LAST_GROUP: rc = %ld\n",
+                       obd->obd_name, PTR_ERR(filp));
                 GOTO(cleanup, rc = PTR_ERR(filp));
         }
         cleanup_phase = 2; /* filp */
 
         rc = fsfilt_read_record(obd, filp, &last_group, sizeof(__u32), &off);
         if (rc) {
-                CDEBUG(D_INODE, "error reading LAST_GROUP: rc %d\n", rc);
+                CERROR("%s: error reading LAST_GROUP: rc %d\n",
+                       obd->obd_name, rc);
                 GOTO(cleanup, rc);
         }
 
         if (off == 0)
                 last_group = FID_SEQ_OST_MDT0;
 
-        CWARN("%s: initialize groups [%u,%u]\n", obd->obd_name,
-              FID_SEQ_OST_MDT0, last_group);
+        CDEBUG(D_INODE, "%s: initialize group %u (max %u)\n", obd->obd_name,
+               FID_SEQ_OST_MDT0, last_group);
         filter->fo_committed_group = last_group;
         rc = filter_read_groups(obd, last_group, 1);
         if (rc)
@@ -1421,7 +1423,7 @@ struct dentry *filter_parent(struct obd_device *obd, obd_seq group, obd_id objid
         struct filter_subdirs *subdirs;
 
         if (group >= filter->fo_group_count) /* FIXME: object groups */
-               return ERR_PTR(-EBADF);
+                return ERR_PTR(-EBADF);
 
         if (!fid_seq_is_mdt(group) || filter->fo_subdir_count == 0)
                 return filter->fo_dentry_O_groups[group];
index 1531475..0fbd562 100644 (file)
@@ -1466,12 +1466,12 @@ int sptlrpc_import_sec_adapt(struct obd_import *imp,
                         sptlrpc_import_sec_adapt_inplace(imp, sec, &sf);
                         GOTO(out, rc);
                 }
-        } else {
-                CWARN("import %s->%s netid %x: select flavor %s\n",
-                      imp->imp_obd->obd_name,
-                      obd_uuid2str(&conn->c_remote_uuid),
-                      LNET_NIDNET(conn->c_self),
-                      sptlrpc_flavor2name(&sf, str, sizeof(str)));
+        } else if (sptlrpc_flavor2name_base(sf.sf_rpc) != SPTLRPC_FLVR_NULL) {
+                LCONSOLE_INFO("import %s->%s netid %x: select flavor %s\n",
+                              imp->imp_obd->obd_name,
+                              obd_uuid2str(&conn->c_remote_uuid),
+                              LNET_NIDNET(conn->c_self),
+                              sptlrpc_flavor2name(&sf, str, sizeof(str)));
         }
 
         cfs_mutex_down(&imp->imp_sec_mutex);