diff options
author | arao <arao@redhat.com> | 2015-06-22 11:10:05 +0530 |
---|---|---|
committer | Raghavendra G <rgowdapp@redhat.com> | 2015-06-29 02:21:53 -0700 |
commit | f6385aeb2f69b36fd02498259258f013582f706f (patch) | |
tree | 204f03a8f058e2ad7750814bb4af3d3b3955fb00 /xlators/performance/md-cache | |
parent | 10dfc9b4d4d04314ccd0f6a4eb0ee0341fd91e0d (diff) |
Logging: Porting the performance translator
logs to new logging framework
> Change-Id: Ie6aaf8d30bd4457bb73c48e23e6b1dea27598644
> BUG: 1194640
> Signed-off-by: arao <arao@redhat.com>
BUG: 1217722
Change-Id: I0856c43dbf8c0a1aa084d4478c9bdf3f41dfc0b8
Signed-off-by: arao <arao@redhat.com>
Reviewed-on: http://review.gluster.org/11442
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators/performance/md-cache')
-rw-r--r-- | xlators/performance/md-cache/src/Makefile.am | 2 | ||||
-rw-r--r-- | xlators/performance/md-cache/src/md-cache-messages.h | 66 | ||||
-rw-r--r-- | xlators/performance/md-cache/src/md-cache.c | 13 |
3 files changed, 74 insertions, 7 deletions
diff --git a/xlators/performance/md-cache/src/Makefile.am b/xlators/performance/md-cache/src/Makefile.am index 6f3d68be1c4..8260b2bb04e 100644 --- a/xlators/performance/md-cache/src/Makefile.am +++ b/xlators/performance/md-cache/src/Makefile.am @@ -6,7 +6,7 @@ md_cache_la_LDFLAGS = -module -avoid-version md_cache_la_SOURCES = md-cache.c md_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -noinst_HEADERS = md-cache-mem-types.h +noinst_HEADERS = md-cache-mem-types.h md-cache-messages.h AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ -I$(CONTRIBDIR)/rbtree diff --git a/xlators/performance/md-cache/src/md-cache-messages.h b/xlators/performance/md-cache/src/md-cache-messages.h new file mode 100644 index 00000000000..2fe8d457a9a --- /dev/null +++ b/xlators/performance/md-cache/src/md-cache-messages.h @@ -0,0 +1,66 @@ +/*Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com> + This file is part of GlusterFS. + + This file is licensed to you under your choice of the GNU Lesser + General Public License, version 3 or any later version (LGPLv3 or + later), or the GNU General Public License, version 2 (GPLv2), in all + cases as published by the Free Software Foundation. +*/ + +#ifndef _MD_CACHE_MESSAGES_H_ +#define _MD_CACHE_MESSAGES_H_ + +#include "glfs-message-id.h" + +/*! \file md-cache-messages.h + * \brief MD_CACHE log-message IDs and their descriptions + * + */ + +/* NOTE: Rules for message additions + * 1) Each instance of a message is _better_ left with a unique message ID, even + * if the message format is the same. Reasoning is that, if the message + * format needs to change in one instance, the other instances are not + * impacted or the new change does not change the ID of the instance being + * modified. + * 2) Addition of a message, + * - Should increment the GLFS_NUM_MESSAGES + * - Append to the list of messages defined, towards the end + * - Retain macro naming as glfs_msg_X (for redability across developers) + * NOTE: Rules for message format modifications + * 3) Check acorss the code if the message ID macro in question is reused + * anywhere. If reused then then the modifications should ensure correctness + * everywhere, or needs a new message ID as (1) above was not adhered to. If + * not used anywhere, proceed with the required modification. + * NOTE: Rules for message deletion + * 4) Check (3) and if used anywhere else, then cannot be deleted. If not used + * anywhere, then can be deleted, but will leave a hole by design, as + * addition rules specify modification to the end of the list and not filling + * holes. + */ + +#define GLFS_MD_CACHE_BASE GLFS_MSGID_COMP_MD_CACHE +#define GLFS_MD_CACHE_NUM_MESSAGES 1 +#define GLFS_MSGID_END (GLFS_MD_CACHE_BASE + GLFS_MD_CACHE_NUM_MESSAGES + 1) + +/* Messages with message IDs */ +#define glfs_msg_start_x GLFS_MD_CACHE_BASE, "Invalid: Start of messages" + + + + +/*! + * @messageid + * @diagnosis + * @recommendedaction None + * + */ + +#define MD_CACHE_MSG_NO_MEMORY (GLFS_MD_CACHE_BASE + 1) + + +/*------------*/ +#define glfs_msg_end_x GLFS_MSGID_END, "Invalid: End of messages" + + +#endif /* _MD_CACHE_MESSAGES_H_ */ diff --git a/xlators/performance/md-cache/src/md-cache.c b/xlators/performance/md-cache/src/md-cache.c index 51c07339fdf..c3b4dfe636f 100644 --- a/xlators/performance/md-cache/src/md-cache.c +++ b/xlators/performance/md-cache/src/md-cache.c @@ -22,6 +22,7 @@ #include "glusterfs-acl.h" #include <assert.h> #include <sys/time.h> +#include "md-cache-messages.h" /* TODO: @@ -292,8 +293,8 @@ mdc_inode_prep (xlator_t *this, inode_t *inode) mdc = GF_CALLOC (sizeof (*mdc), 1, gf_mdc_mt_md_cache_t); if (!mdc) { - gf_log (this->name, GF_LOG_ERROR, - "out of memory :("); + gf_msg (this->name, GF_LOG_ERROR, ENOMEM, + MD_CACHE_MSG_NO_MEMORY, "out of memory"); goto unlock; } @@ -301,8 +302,8 @@ mdc_inode_prep (xlator_t *this, inode_t *inode) ret = __mdc_inode_ctx_set (this, inode, mdc); if (ret) { - gf_log (this->name, GF_LOG_ERROR, - "out of memory :("); + gf_msg (this->name, GF_LOG_ERROR, ENOMEM, + MD_CACHE_MSG_NO_MEMORY, "out of memory"); GF_FREE (mdc); mdc = NULL; } @@ -2247,8 +2248,8 @@ init (xlator_t *this) conf = GF_CALLOC (sizeof (*conf), 1, gf_mdc_mt_mdc_conf_t); if (!conf) { - gf_log (this->name, GF_LOG_ERROR, - "out of memory"); + gf_msg (this->name, GF_LOG_ERROR, ENOMEM, + MD_CACHE_MSG_NO_MEMORY, "out of memory"); return -1; } |