nfs : logging improvements

NFS log-warning messages logged twice in cbk function. Though,
the logging messages are not exactly duplicate, instead of
logging twice, they can be merged to one log message and the
other log message is removed in cbk functions.

Example:
(1)
W [nfs3.c:2075:nfs3svc_write_cbk] 0-nfs: 16f4dce6:
        /f.195 => -1 (Disk quota exceeded)
(2)
W [nfs3-helpers.c:3443:nfs3_log_write_res] 0-nfs-nfsv3:
        XID: 16f4dce6, WRITE: NFS: 69(Resource (quota)
        hard limit exceeded), POSIX: 122
        (Disk quota exceeded), count: 0, UNSTABLE,
        wverf: 1381508849

Here, the second message is more elaborative, and is similar
to (1). Since file name is not present in (2), it is added to (2)
and then removing all mesages of type (1).

Change-Id: I6028ab17b23948493a065dfad92fe4984548511f
BUG: 1254146
Signed-off-by: Manikandan Selvaganesh <mselvaga@redhat.com>
Reviewed-on: http://review.gluster.org/11936
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>

1 files changed, 30 insertions, 30 deletions

diff --git a/xlators/nfs/server/src/nfs-messages.h b/xlators/nfs/server/src/nfs-messages.h
index fe4a798b256..b3d134d11be 100644
--- a/xlators/nfs/server/src/nfs-messages.h
+++ b/xlators/nfs/server/src/nfs-messages.h
@@ -48,7 +48,7 @@
 
 /*------------*/
 
-#define NFS_MSG_SVC_LOOKUP               (GLFS_NFS_BASE + 1)
+#define NFS_MSG_UNUSED_1                (GLFS_NFS_BASE + 1)
 /*!
  * @messageid
  * @diagnosis
@@ -56,7 +56,7 @@
  *
  */
 
-#define NFS_MSG_SVC_PAR_LOOKUP          (GLFS_NFS_BASE + 2)
+#define NFS_MSG_UNUSED_2                (GLFS_NFS_BASE + 2)
 /*!
  * @messageid
  * @diagnosis
@@ -104,7 +104,7 @@
  *
  */
 
-#define NFS_MSG_ACCESS_CBK              (GLFS_NFS_BASE + 8)
+#define NFS_MSG_UNUSED_8                (GLFS_NFS_BASE + 8)
 /*!
  * @messageid
  * @diagnosis
@@ -112,7 +112,7 @@
  *
  */
 
-#define NFS_MSG_READLINK_CBK            (GLFS_NFS_BASE + 9)
+#define NFS_MSG_UNUSED_9                (GLFS_NFS_BASE + 9)
 /*!
  * @messageid
  * @diagnosis
@@ -128,7 +128,7 @@
  *
  */
 
-#define NFS_MSG_READ_CBK                (GLFS_NFS_BASE + 11)
+#define NFS_MSG_UNUSED_11               (GLFS_NFS_BASE + 11)
 /*!
  * @messageid
  * @diagnosis
@@ -151,7 +151,7 @@
  *
  */
 
-#define NFS_MSG_FSYNC_CBK               (GLFS_NFS_BASE + 14)
+#define NFS_MSG_UNUSED_14               (GLFS_NFS_BASE + 14)
 /*!
  * @messageid
  * @diagnosis
@@ -159,7 +159,7 @@
  *
  */
 
-#define NFS_MSG_WRITE_CBK               (GLFS_NFS_BASE + 15)
+#define NFS_MSG_UNUSED_15               (GLFS_NFS_BASE + 15)
 /*!
  * @messageid
  * @diagnosis
@@ -183,7 +183,7 @@
  *
  */
 
-#define NFS_MSG_CREATE_SETATTR_CBK      (GLFS_NFS_BASE + 18)
+#define NFS_MSG_UNUSED_18               (GLFS_NFS_BASE + 18)
 /*!
  * @messageid
  * @diagnosis
@@ -191,7 +191,7 @@
  *
  */
 
-#define NFS_MSG_CREATE_CBK              (GLFS_NFS_BASE + 19)
+#define NFS_MSG_UNUSED_19               (GLFS_NFS_BASE + 19)
 /*!
  * @messageid
  * @diagnosis
@@ -199,7 +199,7 @@
  *
  */
 
-#define NFS_MSG_CREATE_STAT_CBK         (GLFS_NFS_BASE + 20)
+#define NFS_MSG_UNUSED_20               (GLFS_NFS_BASE + 20)
 /*!
  * @messageid
  * @diagnosis
@@ -215,7 +215,8 @@
  * @recommendedaction
  *
  */
-#define NFS_MSG_MKDIR_SETATTR_CBK       (GLFS_NFS_BASE + 22)
+
+#define NFS_MSG_UNUSED_22               (GLFS_NFS_BASE + 22)
 /*!
  * @messageid
  * @diagnosis
@@ -223,8 +224,7 @@
  *
  */
 
-
-#define NFS_MSG_MKDIR_CBK               (GLFS_NFS_BASE + 23)
+#define NFS_MSG_UNUSED_23               (GLFS_NFS_BASE + 23)
 /*!
  * @messageid
  * @diagnosis
@@ -240,7 +240,7 @@
  *
  */
 
-#define NFS_MSG_SYMLINK_CBK             (GLFS_NFS_BASE + 25)
+#define NFS_MSG_UNUSED_25               (GLFS_NFS_BASE + 25)
 /*!
  * @messageid
  * @diagnosis
@@ -256,7 +256,7 @@
  *
  */
 
-#define NFS_MSG_MKNOD_CBK               (GLFS_NFS_BASE + 27)
+#define NFS_MSG_UNUSED_27               (GLFS_NFS_BASE + 27)
 /*!
  * @messageid
  * @diagnosis
@@ -281,7 +281,7 @@
  */
 
 
-#define NFS_MSG_REMOVE_CBK              (GLFS_NFS_BASE + 30)
+#define NFS_MSG_UNUSED_30               (GLFS_NFS_BASE + 30)
 /*!
  * @messageid
  * @diagnosis
@@ -305,7 +305,7 @@
  *
  */
 
-#define NFS_MSG_RENAME_CBK              (GLFS_NFS_BASE + 33)
+#define NFS_MSG_UNUSED_33               (GLFS_NFS_BASE + 33)
 /*!
  * @messageid
  * @diagnosis
@@ -321,7 +321,7 @@
  *
  */
 
-#define NFS_MSG_LINK_CBK                (GLFS_NFS_BASE + 35)
+#define NFS_MSG_UNUSED_35               (GLFS_NFS_BASE + 35)
 /*!
  * @messageid
  * @diagnosis
@@ -337,7 +337,7 @@
  *
  */
 
-#define NFS_MSG_READDIR_FSTAT_CBK       (GLFS_NFS_BASE + 37)
+#define NFS_MSG_UNUSED_37               (GLFS_NFS_BASE + 37)
 /*!
  * @messageid
  * @diagnosis
@@ -345,7 +345,7 @@
  *
  */
 
-#define NFS_MSG_READDIR_CBK             (GLFS_NFS_BASE + 38)
+#define NFS_MSG_UNUSED_38               (GLFS_NFS_BASE + 38)
 /*!
  * @messageid
  * @diagnosis
@@ -369,7 +369,7 @@
  *
  */
 
-#define NFS_MSG_FSSTAT_STAT_CBK         (GLFS_NFS_BASE + 41)
+#define NFS_MSG_UNUSED_41               (GLFS_NFS_BASE + 41)
 /*!
  * @messageid
  * @diagnosis
@@ -377,7 +377,7 @@
  *
  */
 
-#define NFS_MSG_FSSTAT_STATFS_CBK       (GLFS_NFS_BASE + 42)
+#define NFS_MSG_UNUSED_42               (GLFS_NFS_BASE + 42)
 /*!
  * @messageid
  * @diagnosis
@@ -392,7 +392,7 @@
  *
  */
 
-#define NFS_MSG_FSINFO_CBK              (GLFS_NFS_BASE + 44)
+#define NFS_MSG_UNUSED_44               (GLFS_NFS_BASE + 44)
 /*!
  * @messageid
  * @diagnosis
@@ -408,7 +408,7 @@
  *
  */
 
-#define NFS_MSG_PATHCONF_CBK            (GLFS_NFS_BASE + 46)
+#define NFS_MSG_UNUSED_46               (GLFS_NFS_BASE + 46)
 /*!
  * @messageid
  * @diagnosis
@@ -424,7 +424,7 @@
  *
  */
 
-#define NFS_MSG_COMMIT_CBK              (GLFS_NFS_BASE + 48)
+#define NFS_MSG_UNUSED_48               (GLFS_NFS_BASE + 48)
 /*!
  * @messageid
  * @diagnosis
@@ -632,7 +632,7 @@
  *
  */
 
-#define NFS_MSG_GETATTR_LOOKUP_CBK      (GLFS_NFS_BASE + 75)
+#define NFS_MSG_UNUSED_75               (GLFS_NFS_BASE + 75)
 /*!
  * @messageid
  * @diagnosis
@@ -640,7 +640,7 @@
  *
  */
 
-#define NFS_MSG_GETATTR_STAT_CBK        (GLFS_NFS_BASE + 76)
+#define NFS_MSG_UNUSED_76               (GLFS_NFS_BASE + 76)
 /*!
  * @messageid
  * @diagnosis
@@ -664,7 +664,7 @@
  *
  */
 
-#define NFS_MSG_TRUNCATE_CBK            (GLFS_NFS_BASE + 79)
+#define NFS_MSG_UNUSED_79               (GLFS_NFS_BASE + 79)
 /*!
  * @messageid
  * @diagnosis
@@ -672,7 +672,7 @@
  *
  */
 
-#define NFS_MSG_SETATTR_STAT_CBK        (GLFS_NFS_BASE + 80)
+#define NFS_MSG_UNUSED_80               (GLFS_NFS_BASE + 80)
 /*!
  * @messageid
  * @diagnosis
@@ -704,7 +704,7 @@
  *
  */
 
-#define NFS_MSG_SETATTR_CBK             (GLFS_NFS_BASE + 84)
+#define NFS_MSG_UNUSED_84               (GLFS_NFS_BASE + 84)
 /*!
  * @messageid
  * @diagnosis