From 36027983e277235ad30a6c03f00ad8c8fe56bed9 Mon Sep 17 00:00:00 2001

From: arao <arao@redhat.com>

Date: Fri, 6 Mar 2015 12:33:05 +0530

Subject: [PATCH 183/190] afr: Porting messages to new logging framework

      updated

Change-Id: I71bacc6285242cd765c1c3c4fa8ba88f41e92b6a

BUG: 1231779

Signed-off-by: Anusha <arao@redhat.com>

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

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

Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>

Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>

---

 xlators/cluster/afr/src/afr-common.c             |   64 +++--

 xlators/cluster/afr/src/afr-inode-read.c         |   47 ++--

 xlators/cluster/afr/src/afr-inode-write.c        |   14 +-

 xlators/cluster/afr/src/afr-lk-common.c          |  115 ++++----

 xlators/cluster/afr/src/afr-messages.h           |  193 ++++++++++++-

 xlators/cluster/afr/src/afr-open.c               |   22 +-

 xlators/cluster/afr/src/afr-read-txn.c           |   12 +-

 xlators/cluster/afr/src/afr-self-heal-common.c   |   61 ++--

 xlators/cluster/afr/src/afr-self-heal-data.c     |   22 +-

 xlators/cluster/afr/src/afr-self-heal-entry.c    |   71 +++--

 xlators/cluster/afr/src/afr-self-heal-metadata.c |   24 +-

 xlators/cluster/afr/src/afr-self-heal-name.c     |   47 ++--

 xlators/cluster/afr/src/afr-self-heald.c         |  107 ++++---

 xlators/cluster/afr/src/afr-transaction.c        |   48 ++--

 xlators/cluster/afr/src/afr.c                    |   34 ++-

 xlators/cluster/afr/src/pump.c                   |  340 +++++++++++-----------

 16 files changed, 748 insertions(+), 473 deletions(-)

diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c

index 9129b27..31c6eff 100644

--- a/xlators/cluster/afr/src/afr-common.c

+++ b/xlators/cluster/afr/src/afr-common.c

@@ -972,7 +972,8 @@ afr_xattr_req_prepare (xlator_t *this, dict_t *xattr_req)

                 ret = dict_set_uint64 (xattr_req, priv->pending_key[i],

                                        AFR_NUM_CHANGE_LOGS * sizeof(int));

                 if (ret < 0)

-                        gf_log (this->name, GF_LOG_WARNING,

+                        gf_msg (this->name, GF_LOG_WARNING,

+                                -ret, AFR_MSG_DICT_SET_FAILED,

                                 "Unable to set dict value for %s",

                                 priv->pending_key[i]);

                 /* 3 = data+metadata+entry */

@@ -980,14 +981,14 @@ afr_xattr_req_prepare (xlator_t *this, dict_t *xattr_req)

         ret = dict_set_uint64 (xattr_req, AFR_DIRTY,

 			       AFR_NUM_CHANGE_LOGS * sizeof(int));

         if (ret) {

-                gf_log (this->name, GF_LOG_DEBUG, "failed to set dirty "

-                        "query flag");

+                gf_msg_debug (this->name, -ret, "failed to set dirty "

+                              "query flag");

         }

         ret = dict_set_int32 (xattr_req, "list-xattr", 1);

         if (ret) {

-                gf_log (this->name, GF_LOG_DEBUG,

-                        "Unable to set list-xattr in dict ");

+                gf_msg_debug (this->name, -ret,

+                              "Unable to set list-xattr in dict ");

         }

 	return ret;

@@ -1009,27 +1010,26 @@ afr_lookup_xattr_req_prepare (afr_local_t *local, xlator_t *this,

                 dict_copy (xattr_req, local->xattr_req);

         ret = afr_xattr_req_prepare (this, local->xattr_req);

-	if (ret < 0) {

-		gf_log (this->name, GF_LOG_WARNING,

-			"%s: Unable to prepare xattr_req", loc->path);

-	}

         ret = dict_set_uint64 (local->xattr_req, GLUSTERFS_INODELK_COUNT, 0);

         if (ret < 0) {

-                gf_log (this->name, GF_LOG_WARNING,

+                gf_msg (this->name, GF_LOG_WARNING,

+                        -ret, AFR_MSG_DICT_SET_FAILED,

                         "%s: Unable to set dict value for %s",

                         loc->path, GLUSTERFS_INODELK_COUNT);

         }

         ret = dict_set_uint64 (local->xattr_req, GLUSTERFS_ENTRYLK_COUNT, 0);

         if (ret < 0) {

-                gf_log (this->name, GF_LOG_WARNING,

+                gf_msg (this->name, GF_LOG_WARNING,

+                        -ret, AFR_MSG_DICT_SET_FAILED,

                         "%s: Unable to set dict value for %s",

                         loc->path, GLUSTERFS_ENTRYLK_COUNT);

         }

         ret = dict_set_uint32 (local->xattr_req, GLUSTERFS_PARENT_ENTRYLK, 0);

         if (ret < 0) {

-                gf_log (this->name, GF_LOG_WARNING,

+                gf_msg (this->name, GF_LOG_WARNING,

+                        -ret, AFR_MSG_DICT_SET_FAILED,

                         "%s: Unable to set dict value for %s",

                         loc->path, GLUSTERFS_PARENT_ENTRYLK);

         }

@@ -1740,9 +1740,10 @@ afr_local_discovery_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

                 if ((priv->arbiter_count == 1) &&

                     (child_index == ARBITER_BRICK_INDEX))

                         goto out;

-                gf_log (this->name, GF_LOG_INFO,

-                        "selecting local read_child %s",

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

+                        AFR_MSG_LOCAL_CHILD, "selecting local read_child %s",

                         priv->children[child_index]->name);

+

                 priv->read_child = child_index;

         }

 out:

@@ -2053,7 +2054,8 @@ afr_discover_done (call_frame_t *frame, xlator_t *this)

 	read_subvol = afr_data_subvol_get (local->inode, this, 0, 0, NULL);

 	if (read_subvol == -1) {

-		gf_log (this->name, GF_LOG_WARNING, "no read subvols for %s",

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

+                        AFR_MSG_READ_SUBVOL_ERROR, "no read subvols for %s",

 			local->loc.path);

 		for (i = 0; i < priv->child_count; i++) {

@@ -2492,8 +2494,8 @@ __afr_fd_ctx_set (xlator_t *this, fd_t *fd)

         ret = __fd_ctx_set (fd, this, (uint64_t)(long) fd_ctx);

         if (ret)

-                gf_log (this->name, GF_LOG_DEBUG,

-                        "failed to set fd ctx (%p)", fd);

+                gf_msg_debug (this->name, 0,

+                              "failed to set fd ctx (%p)", fd);

 out:

         return ret;

 }

@@ -2623,7 +2625,8 @@ afr_cleanup_fd_ctx (xlator_t *this, fd_t *fd)

         if (fd_ctx) {

                 //no need to take any locks

                 if (!list_empty (&fd_ctx->eager_locked))

-                        gf_log (this->name, GF_LOG_WARNING, "%s: Stale "

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

+                                AFR_MSG_INVALID_DATA, "%s: Stale "

                                 "Eager-lock stubs found",

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

@@ -3048,7 +3051,9 @@ afr_unlock_partial_inodelk_cbk (call_frame_t *frame, void *cookie,

         if (op_ret < 0 && op_errno != ENOTCONN) {

                 loc_gfid (&local->loc, gfid);

-                gf_log (this->name, GF_LOG_ERROR, "%s: Failed to unlock %s "

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

+                        AFR_MSG_INODE_UNLOCK_FAIL,

+                        "%s: Failed to unlock %s "

                         "with lk_owner: %s (%s)", uuid_utoa (gfid),

                         priv->children[child_index]->name,

                         lkowner_utoa (&frame->root->lk_owner),

@@ -4122,7 +4127,8 @@ afr_local_init (afr_local_t *local, afr_private_t *priv, int32_t *op_errno)

                 sizeof (*local->child_up) * priv->child_count);

         local->call_count = AFR_COUNT (local->child_up, priv->child_count);

         if (local->call_count == 0) {

-                gf_log (THIS->name, GF_LOG_INFO, "no subvolumes up");

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

+                        AFR_MSG_ALL_SUBVOLS_DOWN, "no subvolumes up");

                 if (op_errno)

                         *op_errno = ENOTCONN;

                 goto out;

@@ -4680,20 +4686,23 @@ afr_set_heal_info (char *status)

         if (!strcmp (status, "heal")) {

                 ret = dict_set_str (dict, "heal-info", "heal");

                 if (ret)

-                        gf_log ("", GF_LOG_WARNING,

-                                "Failed to set heal-info key to"

+                        gf_msg ("", GF_LOG_WARNING, -ret,

+                                AFR_MSG_DICT_SET_FAILED,

+                                "Failed to set heal-info key to "

                                 "heal");

         } else if (!strcmp (status, "split-brain")) {

                 ret = dict_set_str (dict, "heal-info", "split-brain");

                 if (ret)

-                        gf_log ("", GF_LOG_WARNING,

-                                "Failed to set heal-info key to"

+                        gf_msg ("", GF_LOG_WARNING, -ret,

+                                AFR_MSG_DICT_SET_FAILED,

+                                "Failed to set heal-info key to "

                                 "split-brain");

         } else if (!strcmp (status, "possibly-healing")) {

                 ret = dict_set_str (dict, "heal-info", "possibly-healing");

                 if (ret)

-                       gf_log ("", GF_LOG_WARNING,

-                                "Failed to set heal-info key to"

+                        gf_msg ("", GF_LOG_WARNING, -ret,

+                                AFR_MSG_DICT_SET_FAILED,

+                                "Failed to set heal-info key to "

                                 "possibly-healing");

         }

 out:

@@ -4932,7 +4941,8 @@ afr_heal_splitbrain_file(call_frame_t *frame, xlator_t *this, loc_t *loc)

                 ret = dict_set_str (dict, "sh-fail-msg",

                                     "File not in split-brain");

                 if (ret)

-                        gf_log (this->name, GF_LOG_WARNING,

+                        gf_msg (this->name, GF_LOG_WARNING,

+                                -ret, AFR_MSG_DICT_SET_FAILED,

                                 "Failed to set sh-fail-msg in dict");

                 ret = 0;

                 goto out;

diff --git a/xlators/cluster/afr/src/afr-inode-read.c b/xlators/cluster/afr/src/afr-inode-read.c

index 7fed62a..1ebe5e5 100644

--- a/xlators/cluster/afr/src/afr-inode-read.c

+++ b/xlators/cluster/afr/src/afr-inode-read.c

@@ -38,6 +38,7 @@

 #include "quota-common-utils.h"

 #include "afr-transaction.h"

+#include "afr-messages.h"

 /*

  * Quota size xattrs are not maintained by afr. There is a

@@ -594,8 +595,6 @@ unlock:

                 if (ret) {

                         op_ret = -1;

                         op_errno = ENOMEM;

-                        gf_log (this->name, GF_LOG_ERROR,

-                                "Error serializing dictionary");

                         goto unwind;

                 }

                 if (serz_len == -1)

@@ -606,7 +605,8 @@ unlock:

                 if (ret) {

                         op_ret = -1;

                         op_errno = ENOMEM;

-                        gf_log (this->name, GF_LOG_ERROR,

+                        gf_msg (this->name, GF_LOG_ERROR,

+                                ENOMEM, AFR_MSG_DICT_SET_FAILED,

                                 "Error setting dictionary");

                         goto unwind;

                 }

@@ -682,8 +682,6 @@ unlock:

                 if (ret) {

                         op_ret = -1;

                         op_errno = ENOMEM;

-                        gf_log (this->name, GF_LOG_ERROR,

-                                "Error serializing dictionary");

                         goto unwind;

                 }

                 if (serz_len == -1)

@@ -694,7 +692,8 @@ unlock:

                 if (ret) {

                         op_ret = -1;

                         op_errno = ENOMEM;

-                        gf_log (this->name, GF_LOG_ERROR,

+                        gf_msg (this->name, GF_LOG_ERROR,

+                                ENOMEM, AFR_MSG_DICT_SET_FAILED,

                                 "Error setting dictionary");

                         goto unwind;

                 }

@@ -1047,7 +1046,8 @@ afr_fgetxattr_pathinfo_cbk (call_frame_t *frame, void *cookie,

         int32_t      tlen           = 0;

         if (!frame || !frame->local || !this) {

-                gf_log ("", GF_LOG_ERROR, "possible NULL deref");

+                gf_msg ("", GF_LOG_ERROR, 0,

+                        AFR_MSG_INVALID_ARG, "possible NULL deref");

                 goto out;

         }

@@ -1086,7 +1086,8 @@ afr_fgetxattr_pathinfo_cbk (call_frame_t *frame, void *cookie,

                         ret = dict_set_dynstr (local->dict,

                                                xattr_cky, xattr);

                         if (ret) {

-                                gf_log (this->name, GF_LOG_ERROR,

+                                gf_msg (this->name, GF_LOG_ERROR,

+                                        -ret, AFR_MSG_DICT_SET_FAILED,

                                         "Cannot set xattr cookie key");

                                 goto unlock;

                         }

@@ -1127,8 +1128,6 @@ unlock:

                                                        + strlen (xattr_serz),

                                                        &tlen, ' ');

                 if (ret) {

-                        gf_log (this->name, GF_LOG_ERROR, "Error serializing"

-                                " dictionary");

                         goto unwind;

                 }

@@ -1139,8 +1138,9 @@ unlock:

                 ret = dict_set_dynstr (nxattr, local->cont.getxattr.name,

                                        xattr_serz);

                 if (ret)

-                        gf_log (this->name, GF_LOG_ERROR, "Cannot set pathinfo"

-                                " key in dict");

+                        gf_msg (this->name, GF_LOG_ERROR,

+                                -ret, AFR_MSG_DICT_SET_FAILED,

+                                "Cannot set pathinfo key in dict");

         unwind:

                 AFR_STACK_UNWIND (fgetxattr, frame, local->op_ret,

@@ -1171,7 +1171,8 @@ afr_getxattr_pathinfo_cbk (call_frame_t *frame, void *cookie,

         int32_t      tlen           = 0;

         if (!frame || !frame->local || !this) {

-                gf_log ("", GF_LOG_ERROR, "possible NULL deref");

+                gf_msg ("", GF_LOG_ERROR, 0,

+                        AFR_MSG_INVALID_ARG, "possible NULL deref");

                 goto out;

         }

@@ -1210,8 +1211,11 @@ afr_getxattr_pathinfo_cbk (call_frame_t *frame, void *cookie,

                                 ret = dict_set_dynstr (local->dict,

                                                        xattr_cky, xattr);

                                 if (ret) {

-                                        gf_log (this->name, GF_LOG_ERROR,

-                                                "Cannot set xattr cookie key");

+                                        gf_msg (this->name, GF_LOG_ERROR,

+                                                -ret,

+                                                AFR_MSG_DICT_SET_FAILED,

+                                                "Cannot set xattr "

+                                                "cookie key");

                                         goto unlock;

                                 }

@@ -1248,8 +1252,6 @@ unlock:

                                                        xattr_serz + strlen (xattr_serz),

                                                        &tlen, ' ');

                 if (ret) {

-                        gf_log (this->name, GF_LOG_ERROR, "Error serializing"

-                                " dictionary");

                         goto unwind;

                 }

@@ -1260,8 +1262,9 @@ unlock:

                 ret = dict_set_dynstr (nxattr, local->cont.getxattr.name,

                                        xattr_serz);

                 if (ret)

-                        gf_log (this->name, GF_LOG_ERROR, "Cannot set pathinfo"

-                                " key in dict");

+                        gf_msg (this->name, GF_LOG_ERROR,

+                                -ret, AFR_MSG_DICT_SET_FAILED,

+                                "Cannot set pathinfo key in dict");

         unwind:

                 AFR_STACK_UNWIND (getxattr, frame, local->op_ret,

@@ -1295,7 +1298,8 @@ afr_common_getxattr_stime_cbk (call_frame_t *frame, void *cookie,

         int32_t      callcnt        = 0;

         if (!frame || !frame->local || !this) {

-                gf_log ("", GF_LOG_ERROR, "possible NULL deref");

+                gf_msg ("", GF_LOG_ERROR, 0,

+                        AFR_MSG_INVALID_ARG, "possible NULL deref");

                 goto out;

         }

@@ -1465,9 +1469,6 @@ afr_getxattr (call_frame_t *frame, xlator_t *this,

         if (!strncmp (name, AFR_XATTR_PREFIX,

                       strlen (AFR_XATTR_PREFIX))) {

-                gf_log (this->name, GF_LOG_INFO,

-                        "%s: no data present for key %s",

-                        loc->path, name);

                 op_errno = ENODATA;

                 goto out;

         }

diff --git a/xlators/cluster/afr/src/afr-inode-write.c b/xlators/cluster/afr/src/afr-inode-write.c

index 8800b81..be83781 100644

--- a/xlators/cluster/afr/src/afr-inode-write.c

+++ b/xlators/cluster/afr/src/afr-inode-write.c

@@ -1186,7 +1186,8 @@ afr_split_brain_resolve_do (call_frame_t *frame, xlator_t *this, loc_t *loc,

          */

         ret = afr_inode_split_brain_choice_set (loc->inode, this, -1);

         if (ret)

-                gf_log (this->name, GF_LOG_WARNING, "Failed to set"

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

+                        AFR_MSG_SPLIT_BRAIN_CHOICE_ERROR, "Failed to set"

                         "split-brain choice to -1");

         afr_heal_splitbrain_file (frame, this, loc);

         ret = 0;

@@ -1211,7 +1212,8 @@ afr_get_split_brain_child_index (xlator_t *this, void *value, size_t len)

         spb_child_index = afr_get_child_index_from_name (this,

                                                          spb_child_str);

         if (spb_child_index < 0) {

-                gf_log (this->name, GF_LOG_ERROR, "Invalid subvol: %s",

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

+                        AFR_MSG_INVALID_SUBVOL, "Invalid subvol: %s",

                         spb_child_str);

         }

         return spb_child_index;

@@ -1234,7 +1236,9 @@ afr_can_set_split_brain_choice (void *opaque)

                                   &data->d_spb, &data->m_spb);

         if (ret)

-                gf_log (this->name, GF_LOG_ERROR, "Failed to determine if %s"

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

+                        AFR_MSG_SPLIT_BRAIN_CHOICE_ERROR,

+                        "Failed to determine if %s"

                         " is in split-brain. "

                         "Aborting split-brain-choice set.",

                         uuid_utoa (loc->gfid));

@@ -1292,7 +1296,9 @@ afr_handle_split_brain_commands (xlator_t *this, call_frame_t *frame,

                                     afr_can_set_split_brain_choice,

                                     afr_set_split_brain_choice, NULL, data);

                 if (ret) {

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

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

+                                AFR_MSG_SPLIT_BRAIN_CHOICE_ERROR,

+                                "Failed to create"

                                 " synctask. Aborting split-brain choice set"

                                 " for %s", loc->name);

                         ret = 1;

diff --git a/xlators/cluster/afr/src/afr-lk-common.c b/xlators/cluster/afr/src/afr-lk-common.c

index dc4dfbc..8175a21 100644

--- a/xlators/cluster/afr/src/afr-lk-common.c

+++ b/xlators/cluster/afr/src/afr-lk-common.c

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

 #include "afr.h"

 #include "afr-transaction.h"

+#include "afr-messages.h"

 #include <signal.h>

@@ -111,9 +112,9 @@ afr_set_lock_number (call_frame_t *frame, xlator_t *this)

 void

 afr_set_lk_owner (call_frame_t *frame, xlator_t *this, void *lk_owner)

 {

-        gf_log (this->name, GF_LOG_TRACE,

-                "Setting lk-owner=%llu",

-                (unsigned long long) (unsigned long)lk_owner);

+        gf_msg_trace (this->name, 0,

+                      "Setting lk-owner=%llu",

+                      (unsigned long long) (unsigned long)lk_owner);

         set_lk_owner_from_ptr (&frame->root->lk_owner, lk_owner);

 }

@@ -308,7 +309,7 @@ afr_trace_inodelk_out (call_frame_t *frame, xlator_t *this,

         afr_print_verdict (op_ret, op_errno, verdict);

-        gf_log (this->name, GF_LOG_INFO,

+        gf_msg (this->name, GF_LOG_INFO, 0, AFR_MSG_LOCK_INFO,

                 "[%s %s] [%s] lk-owner=%s Lockee={%s} Number={%llu}",

                 lock_call_type_str,

                 lk_op_type == AFR_LOCK_OP ? "LOCK REPLY" : "UNLOCK REPLY",

@@ -338,7 +339,7 @@ afr_trace_inodelk_in (call_frame_t *frame, xlator_t *this,

         afr_set_lock_call_type (lock_call_type, lock_call_type_str, int_lock);

-        gf_log (this->name, GF_LOG_INFO,

+        gf_msg (this->name, GF_LOG_INFO, 0, AFR_MSG_LOCK_INFO,

                 "[%s %s] Lock={%s} Lockee={%s} Number={%llu}",

                 lock_call_type_str,

                 lk_op_type == AFR_LOCK_OP ? "LOCK REQUEST" : "UNLOCK REQUEST",

@@ -379,7 +380,7 @@ afr_trace_entrylk_in (call_frame_t *frame, xlator_t *this,

         afr_set_lock_call_type (lock_call_type, lock_call_type_str, int_lock);

-        gf_log (this->name, GF_LOG_INFO,

+        gf_msg (this->name, GF_LOG_INFO, 0, AFR_MSG_LOCK_INFO,

                 "[%s %s] Lock={%s} Lockee={%s} Number={%llu}, Cookie={%d}",

                 lock_call_type_str,

                 lk_op_type == AFR_LOCK_OP ? "LOCK REQUEST" : "UNLOCK REQUEST",

@@ -423,7 +424,7 @@ afr_trace_entrylk_out (call_frame_t *frame, xlator_t *this,

         afr_print_verdict (op_ret, op_errno, verdict);

-        gf_log (this->name, GF_LOG_INFO,

+        gf_msg (this->name, GF_LOG_INFO, 0, AFR_MSG_LOCK_INFO,

                 "[%s %s] [%s] Lock={%s} Lockee={%s} Number={%llu} Cookie={%d}",

                 lock_call_type_str,

                 lk_op_type == AFR_LOCK_OP ? "LOCK REPLY" : "UNLOCK REPLY",

@@ -443,20 +444,20 @@ transaction_lk_op (afr_local_t *local)

         int_lock = &local->internal_lock;

         if (int_lock->transaction_lk_type == AFR_TRANSACTION_LK) {

-                gf_log (THIS->name, GF_LOG_DEBUG,

-                        "lk op is for a transaction");

+                gf_msg_debug (THIS->name, 0,

+                              "lk op is for a transaction");

                 ret = 1;

         }

         else if (int_lock->transaction_lk_type == AFR_SELFHEAL_LK) {

-                gf_log (THIS->name, GF_LOG_DEBUG,

-                        "lk op is for a self heal");

+                gf_msg_debug (THIS->name, 0,

+                              "lk op is for a self heal");

                 ret = 0;

         }

         if (ret == -1)

-                gf_log (THIS->name, GF_LOG_DEBUG,

-                        "lk op is not set");

+                gf_msg_debug (THIS->name, 0,

+                              "lk op is not set");

         return ret;

@@ -626,8 +627,9 @@ afr_unlock_common_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

         UNLOCK (&frame->lock);

         if (call_count == 0) {

-                gf_log (this->name, GF_LOG_TRACE,

-                        "All internal locks unlocked");

+                gf_msg_trace (this->name, 0,

+                              "All internal locks unlocked");

+

                 int_lock->lock_cbk (frame, this);

         }

@@ -708,8 +710,9 @@ afr_unlock_inodelk (call_frame_t *frame, xlator_t *this)

         int_lock->lk_call_count = call_count;

         if (!call_count) {

-                gf_log (this->name, GF_LOG_TRACE,

-                        "No internal locks unlocked");

+                gf_msg_trace (this->name, 0,

+                              "No internal locks unlocked");

+

                 int_lock->lock_cbk (frame, this);

                 goto out;

         }

@@ -842,8 +845,8 @@ afr_unlock_entrylk (call_frame_t *frame, xlator_t *this)

         int_lock->lk_call_count = call_count;

         if (!call_count){

-                gf_log (this->name, GF_LOG_TRACE,

-                        "No internal locks unlocked");

+                gf_msg_trace (this->name, 0,

+                              "No internal locks unlocked");

                 int_lock->lock_cbk (frame, this);

                 goto out;

         }

@@ -899,7 +902,8 @@ afr_lock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

                 if (op_ret == -1) {

                         if (op_errno == ENOSYS) {

                                 /* return ENOTSUP */

-                                gf_log (this->name, GF_LOG_ERROR,

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

+                                        AFR_MSG_LOCK_XLATOR_NOT_LOADED,

                                         "subvolume does not support locking. "

                                         "please load features/locks xlator on server");

                                 local->op_ret = op_ret;

@@ -1058,7 +1062,8 @@ afr_lock_blocking (call_frame_t *frame, xlator_t *this, int cookie)

                 ret = fd_ctx_get (local->fd, this, &ctx;;

                 if (ret < 0) {

-                        gf_log (this->name, GF_LOG_INFO,

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

+                                AFR_MSG_FD_CTX_GET_FAILED,

                                 "unable to get fd ctx for fd=%p",

                                 local->fd);

@@ -1076,7 +1081,8 @@ afr_lock_blocking (call_frame_t *frame, xlator_t *this, int cookie)

         if (int_lock->lk_expected_count == int_lock->lk_attempted_count) {

                 if ((is_entrylk && int_lock->entrylk_lock_count == 0) ||

                     (!is_entrylk && int_lock->lock_count == 0)) {

-                        gf_log (this->name, GF_LOG_INFO,

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

+                                AFR_MSG_BLOCKING_LKS_FAILED,

                                 "unable to lock on even one child");

                         local->op_ret           = -1;

@@ -1093,8 +1099,8 @@ afr_lock_blocking (call_frame_t *frame, xlator_t *this, int cookie)

         if (int_lock->lk_expected_count == int_lock->lk_attempted_count) {

                 /* we're done locking */

-                gf_log (this->name, GF_LOG_DEBUG,

-                        "we're done locking");

+                gf_msg_debug (this->name, 0,

+                              "we're done locking");

                 afr_copy_locked_nodes (frame, this);

@@ -1246,9 +1252,11 @@ afr_nonblocking_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

 		if (op_ret < 0 ) {

 			if (op_errno == ENOSYS) {

                         /* return ENOTSUP */

-				gf_log (this->name, GF_LOG_ERROR,

-					"subvolume does not support locking. "

-					"please load features/locks xlator on server");

+			        gf_msg (this->name, GF_LOG_ERROR,

+                                        ENOSYS, AFR_MSG_LOCK_XLATOR_NOT_LOADED,

+                                        "subvolume does not support "

+                                        "locking. please load features/locks"

+                                        " xlator on server");

 				local->op_ret         = op_ret;

 				int_lock->lock_op_ret = op_ret;

@@ -1267,22 +1275,23 @@ afr_nonblocking_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

         UNLOCK (&frame->lock);

         if (call_count == 0) {

-                gf_log (this->name, GF_LOG_TRACE,

-                        "Last locking reply received");

+                gf_msg_trace (this->name, 0,

+                              "Last locking reply received");

                 /* all locks successful. Proceed to call FOP */

                 if (int_lock->entrylk_lock_count ==

                                 int_lock->lk_expected_count) {

-                        gf_log (this->name, GF_LOG_TRACE,

-                                "All servers locked. Calling the cbk");

+                        gf_msg_trace (this->name, 0,

+                                      "All servers locked. Calling the cbk");

                         int_lock->lock_op_ret = 0;

                         int_lock->lock_cbk (frame, this);

                 }

                 /* Not all locks were successful. Unlock and try locking

                    again, this time with serially blocking locks */

                 else {

-                        gf_log (this->name, GF_LOG_TRACE,

-                                "%d servers locked. Trying again with blocking calls",

-                                int_lock->lock_count);

+                        gf_msg_trace (this->name, 0,

+                                      "%d servers locked. Trying again "

+                                      "with blocking calls",

+                                      int_lock->lock_count);

                         afr_unlock(frame, this);

                 }

@@ -1314,7 +1323,8 @@ afr_nonblocking_entrylk (call_frame_t *frame, xlator_t *this)

         if (local->fd) {

                 fd_ctx = afr_fd_ctx_get (local->fd, this);

                 if (!fd_ctx) {

-                        gf_log (this->name, GF_LOG_INFO,

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

+                                AFR_MSG_FD_CTX_GET_FAILED,

                                 "unable to get fd ctx for fd=%p",

                                 local->fd);

@@ -1332,7 +1342,8 @@ afr_nonblocking_entrylk (call_frame_t *frame, xlator_t *this)

                 int_lock->lk_expected_count = call_count;

                 if (!call_count) {

-                        gf_log (this->name, GF_LOG_INFO,

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

+                                AFR_MSG_INFO_COMMON,

                                 "fd not open on any subvolumes. aborting.");

                         afr_unlock (frame, this);

                         goto out;

@@ -1421,10 +1432,11 @@ afr_nonblocking_inodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

 		if (op_ret < 0) {

 			if (op_errno == ENOSYS) {

 				/* return ENOTSUP */

-				gf_log (this->name, GF_LOG_ERROR,

-					"subvolume does not support locking. "

-					"please load features/locks xlator on "

-					"server");

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

+                                        AFR_MSG_LOCK_XLATOR_NOT_LOADED,

+					"subvolume does not support "

+                                        "locking. please load features/locks"

+                                        " xlator on server");

 				local->op_ret                = op_ret;

 				int_lock->lock_op_ret        = op_ret;

 				int_lock->lock_op_errno      = op_errno;

@@ -1454,21 +1466,22 @@ afr_nonblocking_inodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

         UNLOCK (&frame->lock);

         if (call_count == 0) {

-                gf_log (this->name, GF_LOG_TRACE,

-                        "Last inode locking reply received");

+                gf_msg_trace (this->name, 0,

+                              "Last inode locking reply received");

                 /* all locks successful. Proceed to call FOP */

                 if (inodelk->lock_count == int_lock->lk_expected_count) {

-                        gf_log (this->name, GF_LOG_TRACE,

-                                "All servers locked. Calling the cbk");

+                        gf_msg_trace (this->name, 0,

+                                      "All servers locked. Calling the cbk");

                         int_lock->lock_op_ret = 0;

                         int_lock->lock_cbk (frame, this);

                 }

                 /* Not all locks were successful. Unlock and try locking

                    again, this time with serially blocking locks */

                 else {

-                        gf_log (this->name, GF_LOG_TRACE,

-                                "%d servers locked. Trying again with blocking calls",

-                                int_lock->lock_count);

+                        gf_msg_trace (this->name, 0,

+                                      "%d servers locked. "

+                                      "Trying again with blocking calls",

+                                      int_lock->lock_count);

                         afr_unlock(frame, this);

                 }

@@ -1510,7 +1523,8 @@ afr_nonblocking_inodelk (call_frame_t *frame, xlator_t *this)

         if (local->fd) {

                 fd_ctx = afr_fd_ctx_get (local->fd, this);

                 if (!fd_ctx) {

-                        gf_log (this->name, GF_LOG_INFO,

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

+                                AFR_MSG_FD_CTX_GET_FAILED,

                                 "unable to get fd ctx for fd=%p",

                                 local->fd);

@@ -1529,8 +1543,9 @@ afr_nonblocking_inodelk (call_frame_t *frame, xlator_t *this)

                 int_lock->lk_expected_count = call_count;

                 if (!call_count) {

-                        gf_log (this->name, GF_LOG_INFO,

-                                "fd not open on any subvolumes. aborting.");

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

+                                AFR_MSG_ALL_SUBVOLS_DOWN,

+                                "All bricks are down, aborting.");

                         afr_unlock (frame, this);

                         goto out;

                 }

diff --git a/xlators/cluster/afr/src/afr-messages.h b/xlators/cluster/afr/src/afr-messages.h

index 66b8ed1..e4bf85b 100644

--- a/xlators/cluster/afr/src/afr-messages.h

+++ b/xlators/cluster/afr/src/afr-messages.h

@@ -1,5 +1,5 @@

 /*

- Copyright (c) 2014 Red Hat, Inc. <http://www.redhat.com>

+ 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

@@ -44,9 +44,9 @@

  * holes.