From 4e48c71a771fa3ea38312a81de82437c351d68b1 Mon Sep 17 00:00:00 2001

From: Susant Palai <spalai@redhat.com>

Date: Mon, 25 May 2015 16:52:10 +0530

Subject: [PATCH 130/190] features/quota: port QUOTA messages to new logging framework

BUG: 1233694

Change-Id: Iff6d79b5884073306941e6c814a8ab9b18e383eb

Signed-off-by: Susant Palai <spalai@redhat.com>

Reviewed-on: http://review.gluster.org/7574

Tested-by: Gluster Build System <jenkins@build.gluster.com>

Tested-by: NetBSD Build System <jenkins@build.gluster.org>

Reviewed-by: Raghavendra G <rgowdapp@redhat.com>

Tested-by: Raghavendra G <rgowdapp@redhat.com>

Signed-off-by: Susant Palai <spalai@redhat.com>

Reviewed-on: https://code.engineering.redhat.com/gerrit/51134

Reviewed-by: Raghavendra Gowdappa <rgowdapp@redhat.com>

Tested-by: Raghavendra Gowdappa <rgowdapp@redhat.com>

---

 xlators/features/quota/src/Makefile.am             |    3 +-

 xlators/features/quota/src/quota-enforcer-client.c |   46 +-

 xlators/features/quota/src/quota-messages.h        |  247 +++++++++

 xlators/features/quota/src/quota.c                 |  585 ++++++++++----------

 xlators/features/quota/src/quota.h                 |    6 +-

 xlators/features/quota/src/quotad-aggregator.c     |   29 +-

 6 files changed, 594 insertions(+), 322 deletions(-)

 create mode 100644 xlators/features/quota/src/quota-messages.h

diff --git a/xlators/features/quota/src/Makefile.am b/xlators/features/quota/src/Makefile.am

index 7165adc..79bc929 100644

--- a/xlators/features/quota/src/Makefile.am

+++ b/xlators/features/quota/src/Makefile.am

@@ -10,7 +10,8 @@ quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la

 quotad_la_SOURCES = quotad.c quotad-helpers.c quotad-aggregator.c

 quotad_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la

-noinst_HEADERS = quota-mem-types.h quota.h quotad-aggregator.h quotad-helpers.h

+noinst_HEADERS = quota-mem-types.h quota.h quotad-aggregator.h \

+                 quotad-helpers.h quota-messages.h

 AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \

 	-I$(top_srcdir)/xlators/cluster/dht/src -I$(top_srcdir)/rpc/xdr/src/ \

diff --git a/xlators/features/quota/src/quota-enforcer-client.c b/xlators/features/quota/src/quota-enforcer-client.c

index 55e700c..067db6d 100644

--- a/xlators/features/quota/src/quota-enforcer-client.c

+++ b/xlators/features/quota/src/quota-enforcer-client.c

@@ -44,6 +44,7 @@

 #endif

 #include "quota.h"

+#include "quota-messages.h"

 extern struct rpc_clnt_program quota_enforcer_clnt;

@@ -149,7 +150,9 @@ quota_enforcer_lookup_cbk (struct rpc_req *req, struct iovec *iov,

         ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gfs3_lookup_rsp);

         if (ret < 0) {

-                gf_log (this->name, GF_LOG_ERROR, "XDR decoding failed");

+                gf_msg (this->name, GF_LOG_ERROR, 0,

+                        Q_MSG_XDR_DECODING_FAILED,

+                        "XDR decoding failed");

                 rsp.op_ret   = -1;

                 op_errno = EINVAL;

                 goto out;

@@ -170,8 +173,8 @@ quota_enforcer_lookup_cbk (struct rpc_req *req, struct iovec *iov,

         if ((!gf_uuid_is_null (inode->gfid))

             && (gf_uuid_compare (stbuf.ia_gfid, inode->gfid) != 0)) {

-                gf_log (frame->this->name, GF_LOG_DEBUG,

-                        "gfid changed for %s", local->validate_loc.path);

+                gf_msg_debug (frame->this->name, ESTALE,

+                              "gfid changed for %s", local->validate_loc.path);

                 rsp.op_ret = -1;

                 op_errno = ESTALE;

                 goto out;

@@ -226,14 +229,14 @@ out:

         if (rsp.op_ret == -1) {

                 /* any error other than ENOENT */

                 if (rsp.op_errno != ENOENT)

-                        gf_log (this->name, GF_LOG_WARNING,

-                                "remote operation failed: %s. Path: %s (%s)",

-                                strerror (rsp.op_errno),

-                                local->validate_loc.path,

+                        gf_msg (this->name, GF_LOG_WARNING, rsp.op_errno,

+                                Q_MSG_LOOKUP_FAILED,

+                                "Getting cluster-wide size of directory failed "

+                                "(path: %s gfid:%s)", local->validate_loc.path,

                                 loc_gfid_utoa (&local->validate_loc));

                 else

-                        gf_log (this->name, GF_LOG_TRACE,

-                                "not found on remote node");

+                        gf_msg_trace (this->name, ENOENT,

+                                      "not found on remote node");

         } else if (local->quotad_conn_retry) {

                 gf_log (this->name, GF_LOG_DEBUG, "connected to quotad after "

@@ -263,6 +266,7 @@ _quota_enforcer_lookup (void *data)

         call_frame_t           *frame      = NULL;

         loc_t                  *loc        = NULL;

         xlator_t               *this       = NULL;

+        char                   *dir_path       = NULL;

         frame = data;

         local = frame->local;

@@ -291,6 +295,11 @@ _quota_enforcer_lookup (void *data)

         else

                 req.bname = "";

+        if (loc->path)

+                dir_path = (char *)loc->path;

+        else

+                dir_path = "";

+

         ret = quota_enforcer_submit_request (&req, frame,

                                              priv->quota_enforcer,

                                              GF_AGGREGATOR_LOOKUP,

@@ -299,7 +308,10 @@ _quota_enforcer_lookup (void *data)

                                              (xdrproc_t)xdr_gfs3_lookup_req);

         if (ret) {

-                gf_log (this->name, GF_LOG_WARNING, "failed to send the fop");

+                gf_msg (this->name, GF_LOG_WARNING, 0,

+			Q_MSG_RPC_SUBMIT_FAILED, "Couldn't send the request to "

+                        "fetch cluster wide size of directory (path:%s gfid:%s)"

+                        , dir_path, req.gfid);

         }

         GF_FREE (req.xdata.xdata_val);

@@ -351,19 +363,19 @@ quota_enforcer_notify (struct rpc_clnt *rpc, void *mydata,

         switch (event) {

         case RPC_CLNT_CONNECT:

         {

-                gf_log (this->name, GF_LOG_TRACE, "got RPC_CLNT_CONNECT");

+                gf_msg_trace (this->name, 0, "got RPC_CLNT_CONNECT");

                 break;

         }

         case RPC_CLNT_DISCONNECT:

         {

-                gf_log (this->name, GF_LOG_TRACE, "got RPC_CLNT_DISCONNECT");

+                gf_msg_trace (this->name, 0, "got RPC_CLNT_DISCONNECT");

                 break;

         }

         default:

-                gf_log (this->name, GF_LOG_TRACE,

-                        "got some other RPC event %d", event);

+                gf_msg_trace (this->name, 0,

+                              "got some other RPC event %d", event);

                 ret = 0;

                 break;

         }

@@ -449,7 +461,9 @@ quota_enforcer_init (xlator_t *this, dict_t *options)

         ret = rpc_clnt_register_notify (rpc, quota_enforcer_notify, this);

         if (ret) {

-                gf_log ("cli", GF_LOG_ERROR, "failed to register notify");

+                gf_msg ("quota", GF_LOG_ERROR, 0,

+                        Q_MSG_RPCCLNT_REGISTER_NOTIFY_FAILED,

+                        "failed to register notify");

                 goto out;

         }

@@ -466,7 +480,7 @@ out:

         }

         return rpc;

-}

+        }

 struct rpc_clnt_procedure quota_enforcer_actors[GF_AGGREGATOR_MAXVALUE] = {

         [GF_AGGREGATOR_NULL]     = {"NULL", NULL},

diff --git a/xlators/features/quota/src/quota-messages.h b/xlators/features/quota/src/quota-messages.h

new file mode 100644

index 0000000..d39b8d0

--- /dev/null

+++ b/xlators/features/quota/src/quota-messages.h

@@ -0,0 +1,247 @@

+/*

+  Copyright (c) 2013 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 _QUOTA_MESSAGES_H_

+#define _QUOTA_MESSAGES_H_

+

+#ifndef _CONFIG_H

+#define _CONFIG_H

+#include "config.h"

+#endif

+

+#include "glfs-message-id.h"

+

+/*! \file quota-messages.h

+ *  \brief Quota 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 across the code if the message ID macro in question is reused

+ *    anywhere. If reused 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_QUOTA_BASE          GLFS_MSGID_COMP_QUOTA

+#define GLFS_NUM_MESSAGES        23

+#define GLFS_MSGID_END     (GLFS_QUOTA_BASE + GLFS_NUM_MESSAGES + 1)

+/* Messaged with message IDs */

+#define glfs_msg_start_x GLFS_QUOTA_BASE, "Invalid: Start of messages"

+/*------------*/

+

+/*!

+ * @messageid 110001

+ * @diagnosis Quota enforcement has failed.

+ * @recommendedaction None

+ */

+#define Q_MSG_ENFORCEMENT_FAILED        (GLFS_QUOTA_BASE + 1)

+

+

+/*!

+* @messageid 110002

+* @diagnosis system is out of memory

+* @recommendedaction None

+*/

+#define Q_MSG_ENOMEM    (GLFS_QUOTA_BASE + 2)

+

+/*!

+ * @messageid 110003

+ * @diagnosis Parent inode is not present in the  inode table due to the

+ * inode table limits or the brick was restarted recently.

+ * @recommendedaction If it is a brick restart then perform a crawl on the

+ * file system or the specific directory in which the problem is observed.

+ * If inode table limit has been reached,please increase the limit of

+ * network.inode-lru-limit to a higher value(can be set through CLI).

+ */

+#define Q_MSG_PARENT_NULL       (GLFS_QUOTA_BASE + 3)

+

+/*!

+ * @messageid 110005

+ * @diagnosis This is to inform the admin that the user has crossed the soft limit

+ * of the quota configured on the directory and expected to cross the hard limit soon.

+ * @recommendedaction You may reconfigure your quota limits.

+ */

+#define Q_MSG_CROSSED_SOFT_LIMIT        (GLFS_QUOTA_BASE + 4)

+

+/*!

+ * @messageid 110007

+ * @diagnosis Quota translator failed to connect to quotad. This could be

+ * due to one or more of the following reasons, (1) Quotad is not running.

+ * (2) Brick process has run out of memory.

+ * @recommendedaction If quotad is not running, consider starting quotad.

+ * else check system memory consumption.

+ */

+#define Q_MSG_QUOTA_ENFORCER_RPC_INIT_FAILED            (GLFS_QUOTA_BASE + 5)

+

+/*!

+ * @messageid 110008

+ * @diagnosis Getting cluster-wide size failed

+ * @recommendedaction Restart quotad. Kill quotad by searching

+ * "ps ax | grep quotad" and use volume start force to restart it.

+ */

+

+#define Q_MSG_REMOTE_OPERATION_FAILED   (GLFS_QUOTA_BASE + 6)

+

+/*!

+ * @messageid 110009

+ * @diagnosis Updation of global quota size failed. This may be due to quotad

+ * is down or lost connection with quotad.

+ * @recommendedaction Please restart quotad.

+ */

+

+#define Q_MSG_FAILED_TO_SEND_FOP        (GLFS_QUOTA_BASE + 7)

+

+/*!

+ * @messageid 110010

+ * @diagnosis

+ * @recommendedaction Check volfile for correctness

+ */

+

+#define Q_MSG_INVALID_VOLFILE        (GLFS_QUOTA_BASE + 8)

+

+/*!

+ * @messageid 110011

+ * @diagnosis

+ * @recommendedaction

+ */

+

+#define Q_MSG_INODE_PARENT_NOT_FOUND        (GLFS_QUOTA_BASE + 9)

+

+/*!

+ * @messageid 110012

+ * @diagnosis

+ * @recommendedaction

+ */

+

+#define Q_MSG_XDR_DECODE_ERROR        (GLFS_QUOTA_BASE + 10)

+

+/*!

+ * @messageid 110013

+ * @diagnosis

+ * @recommendedaction

+ */

+

+#define Q_MSG_DICT_UNSERIALIZE_FAIL        (GLFS_QUOTA_BASE + 11)

+

+/*!

+ * @messageid 110014

+ * @diagnosis

+ * @recommendedaction

+ */

+

+#define Q_MSG_DICT_SERIALIZE_FAIL        (GLFS_QUOTA_BASE + 12)

+

+/*!

+ * @messageid 110015

+ * @diagnosis

+ * @recommendedaction

+ */

+

+#define Q_MSG_RPCSVC_INIT_FAILED        (GLFS_QUOTA_BASE + 13)

+

+/*!

+ * @messageid 110016

+ * @diagnosis

+ * @recommendedaction

+ */

+

+#define Q_MSG_RPCSVC_LISTENER_CREATION_FAILED        (GLFS_QUOTA_BASE + 14)

+

+/*!

+ * @messageid 110017

+ * @diagnosis

+ * @recommendedaction

+ */

+

+#define Q_MSG_RPCSVC_REGISTER_FAILED        (GLFS_QUOTA_BASE + 15)

+

+/*!

+ * @messageid 110018

+ * @diagnosis

+ * @recommendedaction

+ */

+

+#define Q_MSG_XDR_DECODING_FAILED        (GLFS_QUOTA_BASE + 16)

+/*!

+ * @messageid 110019

+ * @diagnosis

+ * @recommendedaction

+ */

+

+#define Q_MSG_RPCCLNT_REGISTER_NOTIFY_FAILED        (GLFS_QUOTA_BASE + 17)

+/*!

+ * @messageid 110020

+ * @diagnosis

+ * @recommendedaction Umount and mount the corresponing volume

+ */

+

+#define Q_MSG_ANCESTRY_BUILD_FAILED        (GLFS_QUOTA_BASE + 18)

+

+/*!

+ * @messageid 110021

+ * @diagnosis

+ * @recommendedaction

+ */

+

+#define Q_MSG_SIZE_KEY_MISSING        (GLFS_QUOTA_BASE + 19)

+

+/*!

+ * @messageid 110022

+ * @diagnosis

+ * @recommendedaction

+ */

+

+#define Q_MSG_INODE_CTX_GET_FAILED     (GLFS_QUOTA_BASE + 20)

+

+/*!

+ * @messageid 110023

+ * @diagnosis

+ * @recommendedaction

+ */

+

+#define Q_MSG_INODE_CTX_SET_FAILED     (GLFS_QUOTA_BASE + 21)

+

+/*!

+ * @messageid 110024

+ * @diagnosis

+ * @recommendedaction

+ */

+

+#define Q_MSG_LOOKUP_FAILED     (GLFS_QUOTA_BASE + 22)

+

+/*!

+ * @messageid 110025

+ * @diagnosis

+ * @recommendedaction

+ */

+

+#define Q_MSG_RPC_SUBMIT_FAILED     (GLFS_QUOTA_BASE + 23)

+

+/*------------*/

+#define glfs_msg_end_x GLFS_MSGID_END, "Invalid: End of messages"

+

+#endif /* !_QUOTA_MESSAGES_H_ */

+

diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c

index ef094f8..3212cb0 100644

--- a/xlators/features/quota/src/quota.c

+++ b/xlators/features/quota/src/quota.c

@@ -14,6 +14,7 @@

 #include "defaults.h"

 #include "statedump.h"

 #include "quota-common-utils.h"

+#include "quota-messages.h"

 struct volume_options options[];

@@ -40,9 +41,9 @@ __quota_init_inode_ctx (inode_t *inode, xlator_t *this,

         ret = __inode_ctx_put (inode, this, (uint64_t )(long)ctx);

         if (ret == -1) {

-                gf_log (this->name, GF_LOG_WARNING,

-                        "cannot set quota context in inode (gfid:%s)",

-                        uuid_utoa (inode->gfid));

+                gf_msg (this->name, GF_LOG_WARNING, 0,

+                        Q_MSG_INODE_CTX_SET_FAILED, "cannot set quota context "

+                        "in inode (gfid:%s)", uuid_utoa (inode->gfid));

         }

 out:

         return ret;

@@ -124,22 +125,21 @@ quota_inode_loc_fill (inode_t *inode, loc_t *loc)

         parent = inode_parent (inode, 0, NULL);

         if (!parent) {

-                gf_log (this->name, GF_LOG_DEBUG,

-                        "cannot find parent for inode (gfid:%s)",

-                        uuid_utoa (inode->gfid));

+                gf_msg_debug (this->name, 0, "cannot find parent for "

+                              "inode (gfid:%s)", uuid_utoa (inode->gfid));

         }

 ignore_parent:

         ret = inode_path (inode, NULL, &resolvedpath);

         if (ret < 0) {

-                gf_log (this->name, GF_LOG_DEBUG,

-                        "cannot construct path for inode (gfid:%s)",

-                        uuid_utoa (inode->gfid));

+                gf_msg_debug (this->name, 0, "cannot construct path for "

+                              "inode (gfid:%s)",  uuid_utoa (inode->gfid));

         }

         ret = quota_loc_fill (loc, inode, parent, resolvedpath);

         if (ret < 0) {

-                gf_log (this->name, GF_LOG_WARNING, "cannot fill loc");

+                gf_msg (this->name, GF_LOG_WARNING, ENOMEM, Q_MSG_ENOMEM,

+                        "cannot fill loc");

                 goto err;

         }

@@ -260,7 +260,9 @@ quota_inode_parent (inode_t *inode, uuid_t pargfid, const char *name)

         parent = __quota_inode_parent (inode, pargfid, name);

         if (!parent)

-                gf_log_callingfn (THIS->name, GF_LOG_ERROR, "Failed to find "

+                gf_msg_callingfn (THIS->name, GF_LOG_ERROR, 0,

+                                  Q_MSG_PARENT_NULL,

+                                  "Failed to find "

                                   "ancestor for inode (%s)",

                                   uuid_utoa(inode->gfid));

@@ -349,7 +351,8 @@ check_ancestory_continue (struct list_head *parents, inode_t *inode,

         local = frame->local;

         if (parents && list_empty (parents)) {

-                gf_log (THIS->name, GF_LOG_WARNING,

+                gf_msg (THIS->name, GF_LOG_WARNING, EIO,

+                        Q_MSG_ANCESTRY_BUILD_FAILED,

                         "Couldn't build ancestry for inode (gfid:%s). "

                         "Without knowing ancestors till root, quota "

                         "cannot be enforced. "

@@ -413,7 +416,8 @@ check_ancestory_2_cbk (struct list_head *parents, inode_t *inode,

                 goto out;

         if (parents == NULL || list_empty (parents)) {

-                gf_log (THIS->name, GF_LOG_WARNING,

+                gf_msg (THIS->name, GF_LOG_WARNING, 0,

+                        Q_MSG_ENFORCEMENT_FAILED,

                         "Couldn't build ancestry for inode (gfid:%s). "

                         "Without knowing ancestors till root, quota "

                         "cannot be enforced.",

@@ -558,8 +562,9 @@ quota_validate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

         ctx = (quota_inode_ctx_t *)(unsigned long)value;

         if ((ret == -1) || (ctx == NULL)) {

-                gf_log (this->name, GF_LOG_WARNING,

-                        "quota context is not present in inode (gfid:%s)",

+                gf_msg (this->name, GF_LOG_WARNING, EINVAL,

+			Q_MSG_INODE_CTX_GET_FAILED, "quota context is"

+			" not present in  inode (gfid:%s)",

                         uuid_utoa (local->validate_loc.inode->gfid));

                 op_errno = EINVAL;

                 goto unwind;

@@ -567,8 +572,9 @@ quota_validate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

         ret = quota_dict_get_meta (xdata, QUOTA_SIZE_KEY, &size);

         if (ret == -1) {

-                gf_log (this->name, GF_LOG_WARNING, "dict get failed "

-                        "on quota size");

+                gf_msg (this->name, GF_LOG_WARNING, EINVAL,

+			Q_MSG_SIZE_KEY_MISSING, "quota size key not present "

+                        "in dict");

                 op_errno = EINVAL;

         }

@@ -662,7 +668,8 @@ quota_build_ancestry_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

         parent = inode_parent (local->loc.inode, 0, NULL);

         if (parent == NULL) {

-                gf_log (this->name, GF_LOG_WARNING, "parent is NULL");

+                gf_msg (this->name, GF_LOG_WARNING, EINVAL,

+                        Q_MSG_PARENT_NULL, "parent is NULL");

                 op_errno = EINVAL;

                 goto err;

         }

@@ -855,8 +862,9 @@ quota_validate (call_frame_t *frame, inode_t *inode, xlator_t *this,

                 ret = quota_inode_loc_fill (inode, &local->validate_loc);

                 if (ret < 0) {

-                        gf_log (this->name, GF_LOG_WARNING,

-                                "cannot fill loc for inode (gfid:%s), hence "

+                        gf_msg (this->name, GF_LOG_WARNING, ENOMEM,

+                                Q_MSG_ENFORCEMENT_FAILED,

+				"cannot fill loc for inode (gfid:%s), hence "

                                 "aborting quota-checks and continuing with fop",

                                 uuid_utoa (inode->gfid));

                 }

@@ -876,14 +884,16 @@ quota_validate (call_frame_t *frame, inode_t *inode, xlator_t *this,

         ret = dict_set_int8 (xdata, QUOTA_SIZE_KEY, 1);

         if (ret < 0) {

-                gf_log (this->name, GF_LOG_WARNING, "dict set failed");

+                gf_msg (this->name, GF_LOG_WARNING, ENOMEM,

+			Q_MSG_ENOMEM, "dict set failed");

                 ret = -ENOMEM;

                 goto err;

         }

         ret = dict_set_str (xdata, "volume-uuid", priv->volume_uuid);

         if (ret < 0) {

-                gf_log (this->name, GF_LOG_WARNING, "dict set failed");

+                gf_msg (this->name, GF_LOG_WARNING, ENOMEM,

+			Q_MSG_ENOMEM, "dict set failed");

                 ret = -ENOMEM;

                 goto err;

         }

@@ -919,12 +929,13 @@ quota_check_limit_continuation (struct list_head *parents, inode_t *inode,

         if ((op_ret < 0) || list_empty (parents)) {

                 if (op_ret >= 0) {

-                        gf_log (this->name, GF_LOG_WARNING,

+                        gf_msg (this->name, GF_LOG_WARNING, EIO,

+				Q_MSG_ANCESTRY_BUILD_FAILED,

                                 "Couldn't build ancestry for inode (gfid:%s). "

-                                "Without knowing ancestors till root, quota "

+				"Without knowing ancestors till root, quota"

                                 "cannot be enforced. "

                                 "Hence, failing fop with EIO",

-                                uuid_utoa (inode->gfid));

+				uuid_utoa (inode->gfid));

                         op_errno = EIO;

                 }

@@ -1184,7 +1195,8 @@ quota_check_limit (call_frame_t *frame, inode_t *inode, xlator_t *this,

                         goto done;

                 if (ret) {

-                        gf_log (this->name, GF_LOG_ERROR, "Failed to check "

+                        gf_msg (this->name, GF_LOG_ERROR, 0,

+                                Q_MSG_ENFORCEMENT_FAILED, "Failed to check "

                                 "quota object limit");

                         goto err;

                 }

@@ -1196,7 +1208,8 @@ quota_check_limit (call_frame_t *frame, inode_t *inode, xlator_t *this,

                         goto done;

                 if (ret) {

-                        gf_log (this->name, GF_LOG_ERROR, "Failed to check "

+                        gf_msg (this->name, GF_LOG_ERROR, 0,

+                                Q_MSG_ENFORCEMENT_FAILED, "Failed to check "

                                 "quota size limit");

                         goto err;

                 }

@@ -1334,9 +1347,9 @@ quota_fill_inodectx (xlator_t *this, inode_t *inode, dict_t *dict,

         ret = quota_inode_ctx_get (inode, this, &ctx, 1);

         if ((ret == -1) || (ctx == NULL)) {

-                gf_log (this->name, GF_LOG_WARNING, "cannot create quota "

-                        "context in inode(gfid:%s)",

-                        uuid_utoa (inode->gfid));

+                gf_msg (this->name, GF_LOG_WARNING, ENOMEM,

+                        Q_MSG_INODE_CTX_GET_FAILED, "cannot create quota "

+                        "context in inode(gfid:%s)", uuid_utoa (inode->gfid));

                 ret = -1;

                 *op_errno = ENOMEM;

                 goto out;

@@ -1374,11 +1387,12 @@ quota_fill_inodectx (xlator_t *this, inode_t *inode, dict_t *dict,

                                                      loc->parent->gfid);

                         if (dentry == NULL) {

                                 /*

-                                  gf_log (this->name, GF_LOG_WARNING,

-                                        "cannot create a new dentry (par:%"

-                                        PRId64", name:%s) for inode(ino:%"

-                                        PRId64", gfid:%s)",

-                                        uuid_utoa (local->loc.inode->gfid));

+                                  gf_msg (this->name, GF_LOG_WARNING, ENOMEM,

+					  Q_MSG_ENOMEM,

+                                          "cannot create a new dentry (par:%"

+-                                          PRId64", name:%s) for inode(ino:%"

+-                                          PRId64", gfid:%s)",

+-                                          uuid_utoa (local->loc.inode->gfid));

                                 */

                                 ret = -1;

                                 *op_errno = ENOMEM;

@@ -1457,14 +1471,15 @@ quota_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc,

         ret = dict_set_int8 (xattr_req, QUOTA_LIMIT_KEY, 1);

         if (ret < 0) {

-                gf_log (this->name, GF_LOG_WARNING,

-                        "dict set of key for hard-limit failed");

+                gf_msg (this->name, GF_LOG_WARNING, ENOMEM,

+			Q_MSG_ENOMEM, "dict set of key for "

+                        "hard-limit failed");

                 goto err;

         }

         ret = dict_set_int8 (xattr_req, QUOTA_LIMIT_OBJECTS_KEY, 1);

         if (ret < 0) {

-                gf_log (this->name, GF_LOG_WARNING,

+                gf_msg (this->name, GF_LOG_WARNING, ENOMEM, Q_MSG_ENOMEM,

                         "dict set of key for quota object limit failed");

                 goto err;

         }

@@ -1509,15 +1524,17 @@ quota_writev_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

         ret = inode_ctx_get (local->loc.inode, this, &ctx_int);

         if (ret) {

-                gf_log (this->name, GF_LOG_WARNING,

-                        "%s: failed to get the context", local->loc.path);

+                gf_msg (this->name, GF_LOG_WARNING, 0,

+                        Q_MSG_INODE_CTX_GET_FAILED, "%s: failed to get the "

+			"context", local->loc.path);

                 goto out;

         }

         ctx = (quota_inode_ctx_t *)(unsigned long) ctx_int;

         if (ctx == NULL) {

-                gf_log (this->name, GF_LOG_WARNING,

+                gf_msg (this->name, GF_LOG_WARNING, 0,

+			Q_MSG_INODE_CTX_GET_FAILED,

                         "quota context not set in %s (gfid:%s)",

                         local->loc.path, uuid_utoa (local->loc.inode->gfid));

                 goto out;

@@ -1551,10 +1568,8 @@ quota_writev_helper (call_frame_t *frame, xlator_t *this, fd_t *fd,

         priv = this->private;

         local = frame->local;

-        if (local == NULL) {

-                gf_log (this->name, GF_LOG_WARNING, "local is NULL");

-                goto unwind;

-        }

+

+        GF_VALIDATE_OR_GOTO ("quota", local, unwind);

         if (local->op_ret == -1) {

                 op_errno = local->op_errno;

@@ -1647,11 +1662,10 @@ quota_writev (call_frame_t *frame, xlator_t *this, fd_t *fd,

         ret = quota_inode_ctx_get (fd->inode, this, &ctx, 0);

         if (ctx == NULL) {

-                gf_log (this->name, GF_LOG_DEBUG, "quota context is NULL on "

-                        "inode (%s). "

-                        "If quota is not enabled recently and crawler has "

-                        "finished crawling, its an error",

-                        uuid_utoa (fd->inode->gfid));

+                gf_msg_debug (this->name, 0, "quota context is NULL on inode"

+                              " (%s). If quota is not enabled recently and "

+                              "crawler has finished crawling, its an error",

+                              uuid_utoa (fd->inode->gfid));

         }

         stub = fop_writev_stub (frame, quota_writev_helper, fd, vector, count,

@@ -1733,10 +1747,8 @@ quota_mkdir_helper (call_frame_t *frame, xlator_t *this, loc_t *loc,

         int32_t        op_errno = EINVAL;

         local = frame->local;

-        if (local == NULL) {