From 5d89662a0e5d5d30498122ee70720928a812a5dd Mon Sep 17 00:00:00 2001

From: Nandaja Varma <nandaja.varma@gmail.com>

Date: Mon, 23 Mar 2015 11:36:37 +0530

Subject: [PATCH 091/101] utils/glusterd: Porting to new logging framwork

cherry-pick of the commit 9863c8940936989d2ffb3c8ac28431d2b313384d

>Change-Id: Iacb30eb675693bcdb3ef9de8e7f43892c5d79f6d

>BUG: 1194640

>Signed-off-by: Nandaja Varma <nandaja.varma@gmail.com>

>Reviewed-on: http://review.gluster.org/9967

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

>Reviewed-by: Poornima G <pgurusid@redhat.com>

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

>Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>

>Reviewed-by: Kaushal M <kaushal@redhat.com>

Change-Id: Iacb30eb675693bcdb3ef9de8e7f43892c5d79f6d

BUG: 1231771

Signed-off-by: Nandaja Varma <nandaja.varma@gmail.com>

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

Reviewed-by: Atin Mukherjee <amukherj@redhat.com>

Tested-by: Atin Mukherjee <amukherj@redhat.com>

---

 xlators/mgmt/glusterd/src/glusterd-messages.h   |   90 +++-

 xlators/mgmt/glusterd/src/glusterd-peer-utils.c |   76 ++-

 xlators/mgmt/glusterd/src/glusterd-utils.c      |  844 +++++++++++++++--------

 3 files changed, 686 insertions(+), 324 deletions(-)

diff --git a/xlators/mgmt/glusterd/src/glusterd-messages.h b/xlators/mgmt/glusterd/src/glusterd-messages.h

index f66b8db..16002bc 100644

--- a/xlators/mgmt/glusterd/src/glusterd-messages.h

+++ b/xlators/mgmt/glusterd/src/glusterd-messages.h

@@ -45,7 +45,7 @@

  */

 #define GLUSTERD_COMP_BASE      GLFS_MSGID_GLUSTERD

-#define GLFS_NUM_MESSAGES       447

+#define GLFS_NUM_MESSAGES       458

 #define GLFS_MSGID_END          (GLUSTERD_COMP_BASE + GLFS_NUM_MESSAGES + 1)

 /* Messaged with message IDs */

 #define glfs_msg_start_x GLFS_COMP_BASE, "Invalid: Start of messages"

@@ -3626,6 +3626,94 @@

  */

 #define GD_MSG_VOL_TYPE_CHANGING_INFO               (GLUSTERD_COMP_BASE + 447)

+/*!

+ * @messageid

+ * @diagnosis

+ * @recommendedaction

+ *

+ */

+#define GD_MSG_BRKPATH_MNTPNT_MISMATCH               (GLUSTERD_COMP_BASE + 448)

+

+/*!

+ * @messageid

+ * @diagnosis

+ * @recommendedaction

+ *

+ */

+#define GD_MSG_TASKS_COUNT_MISMATCH                  (GLUSTERD_COMP_BASE + 449)

+

+/*!

+ * @messageid

+ * @diagnosis

+ * @recommendedaction

+ *

+ */

+#define GD_MSG_WRONG_OPTS_SETTING                    (GLUSTERD_COMP_BASE + 450)

+

+/*!

+ * @messageid

+ * @diagnosis

+ * @recommendedaction

+ *

+ */

+#define GD_MSG_PATH_ALREADY_PART_OF_VOL               (GLUSTERD_COMP_BASE + 451)

+

+/*!

+ * @messageid

+ * @diagnosis

+ * @recommendedaction

+ *

+ */

+#define GD_MSG_BRICK_VALIDATE_FAIL                    (GLUSTERD_COMP_BASE + 452)

+

+/*!

+ * @messageid

+ * @diagnosis

+ * @recommendedaction

+ *

+ */

+#define GD_MSG_READIN_FILE_FAILED                     (GLUSTERD_COMP_BASE + 453)

+

+/*!

+ * @messageid

+ * @diagnosis

+ * @recommendedaction

+ *

+ */

+#define GD_MSG_IMPORT_PRDICT_DICT                     (GLUSTERD_COMP_BASE + 454)

+

+/*!

+ * @messageid

+ * @diagnosis

+ * @recommendedaction

+ *

+ */

+#define GD_MSG_VOL_OPTS_IMPORT_FAIL                   (GLUSTERD_COMP_BASE + 455)

+

+/*!

+ * @messageid

+ * @diagnosis

+ * @recommendedaction

+ *

+ */

+#define GD_MSG_BRICK_IMPORT_FAIL                      (GLUSTERD_COMP_BASE + 456)

+

+/*!

+ * @messageid

+ * @diagnosis

+ * @recommendedaction

+ *

+ */

+#define GD_MSG_VOLINFO_IMPORT_FAIL                    (GLUSTERD_COMP_BASE + 457)

+

+/*!

+ * @messageid

+ * @diagnosis

+ * @recommendedaction

+ *

+ */

+#define GD_MSG_BRICK_ID_GEN_FAILED                    (GLUSTERD_COMP_BASE + 458)

+

 /*------------*/

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

diff --git a/xlators/mgmt/glusterd/src/glusterd-peer-utils.c b/xlators/mgmt/glusterd/src/glusterd-peer-utils.c

index 6df1dae..5ece68c 100644

--- a/xlators/mgmt/glusterd/src/glusterd-peer-utils.c

+++ b/xlators/mgmt/glusterd/src/glusterd-peer-utils.c

@@ -11,6 +11,7 @@

 #include "glusterd-peer-utils.h"

 #include "glusterd-store.h"

 #include "glusterd-server-quorum.h"

+#include "glusterd-messages.h"

 #include "common-utils.h"

 void

@@ -32,7 +33,9 @@ glusterd_peerinfo_destroy (struct rcu_head *head)

         ret = glusterd_store_delete_peerinfo (peerinfo);

         if (ret) {

-                gf_log ("glusterd", GF_LOG_ERROR, "Deleting peer info failed");

+                gf_msg ("glusterd", GF_LOG_ERROR, errno,

+                        GD_MSG_PEERINFO_DELETE_FAIL,

+                        "Deleting peer info failed");

         }

         GF_FREE (peerinfo->hostname);

@@ -111,7 +114,8 @@ glusterd_peerinfo_find_by_hostname (const char *hoststr)

         ret = getaddrinfo (hoststr, NULL, NULL, &addr);

         if (ret != 0) {

-                gf_log (this->name, GF_LOG_ERROR,

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

+                        GD_MSG_GETADDRINFO_FAIL,

                         "error in getaddrinfo: %s\n",

                         gai_strerror(ret));

                 goto out;

@@ -126,7 +130,7 @@ glusterd_peerinfo_find_by_hostname (const char *hoststr)

         }

 out:

-        gf_log (this->name, GF_LOG_DEBUG, "Unable to find friend: %s", hoststr);

+        gf_msg_debug (this->name, 0, "Unable to find friend: %s", hoststr);

         if (addr)

                 freeaddrinfo (addr);

         return NULL;

@@ -161,7 +165,7 @@ glusterd_hostname_to_uuid (char *hostname, uuid_t uuid)

                 }

         }

-        gf_log (this->name, GF_LOG_DEBUG, "returning %d", ret);

+        gf_msg_debug (this->name, 0, "returning %d", ret);

         return ret;

 }

@@ -191,7 +195,7 @@ glusterd_peerinfo_find_by_uuid (uuid_t uuid)

         cds_list_for_each_entry_rcu (entry, &priv->peers, uuid_list) {

                 if (!gf_uuid_compare (entry->uuid, uuid)) {

-                        gf_log (this->name, GF_LOG_DEBUG,

+                        gf_msg_debug (this->name, 0,

                                  "Friend found... state: %s",

                         glusterd_friend_sm_state_name_get (entry->state.state));

                         found = entry; /* Probably should be rcu_dereferenced */

@@ -201,7 +205,7 @@ glusterd_peerinfo_find_by_uuid (uuid_t uuid)

         rcu_read_unlock ();

         if (!found)

-                gf_log (this->name, GF_LOG_DEBUG,

+                gf_msg_debug (this->name, 0,

                         "Friend with uuid: %s, not found", uuid_utoa (uuid));

         return found;

 }

@@ -226,7 +230,7 @@ glusterd_peerinfo_find (uuid_t uuid, const char *hostname)

                 if (peerinfo) {

                         return peerinfo;

                 } else {

-                        gf_log (this->name, GF_LOG_DEBUG,

+                        gf_msg_debug (this->name, 0,

                                  "Unable to find peer by uuid: %s",

                                  uuid_utoa (uuid));

                 }

@@ -239,7 +243,7 @@ glusterd_peerinfo_find (uuid_t uuid, const char *hostname)

                 if (peerinfo) {

                         return peerinfo;

                 } else {

-                        gf_log (this->name, GF_LOG_DEBUG,

+                        gf_msg_debug (this->name, 0,

                                 "Unable to find hostname: %s", hostname);

                 }

         }

@@ -342,7 +346,7 @@ glusterd_chk_peers_connected_befriended (uuid_t skip_uuid)

         }

         rcu_read_unlock ();

-        gf_log (THIS->name, GF_LOG_DEBUG, "Returning %s",

+        gf_msg_debug (THIS->name, 0, "Returning %s",

                 (ret?"TRUE":"FALSE"));

         return ret;

 }

@@ -413,7 +417,7 @@ glusterd_are_vol_all_peers_up (glusterd_volinfo_t *volinfo,

                            (peerinfo->state.state !=

                              GD_FRIEND_STATE_BEFRIENDED)) {

                                 *down_peerstr = gf_strdup (peerinfo->hostname);

-                                gf_log ("", GF_LOG_DEBUG, "Peer %s is down. ",

+                                gf_msg_debug (THIS->name, 0, "Peer %s is down. ",

                                         peerinfo->hostname);

                                 rcu_read_unlock ();

                                 goto out;

@@ -424,7 +428,7 @@ glusterd_are_vol_all_peers_up (glusterd_volinfo_t *volinfo,

         ret = _gf_true;

 out:

-        gf_log ("glusterd", GF_LOG_DEBUG, "Returning %d", ret);

+        gf_msg_debug ("glusterd", 0, "Returning %d", ret);

         return ret;

 }

@@ -451,7 +455,7 @@ glusterd_peer_hostname_new (const char *hostname,

         ret = 0;

 out:

-        gf_log ("glusterd", GF_LOG_DEBUG, "Returning %d", ret);

+        gf_msg_debug ("glusterd", 0, "Returning %d", ret);

         return ret;

 }

@@ -548,7 +552,8 @@ gd_add_friend_to_dict (glusterd_peerinfo_t *friend, dict_t *dict,

         snprintf (key, sizeof (key), "%s.uuid", prefix);

         ret = dict_set_dynstr_with_alloc (dict, key, uuid_utoa (friend->uuid));

         if (ret) {

-                gf_log (this->name, GF_LOG_ERROR,

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

+                        GD_MSG_DICT_SET_FAILED,

                         "Failed to set key %s in dict", key);

                 goto out;

         }

@@ -562,13 +567,16 @@ gd_add_friend_to_dict (glusterd_peerinfo_t *friend, dict_t *dict,

                                   hostname_list);

         if (!address) {

                 ret = -1;

-                gf_log (this->name, GF_LOG_ERROR, "Could not retrieve first "

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

+                        GD_MSG_PEER_ADDRESS_GET_FAIL,

+                        "Could not retrieve first "

                         "address for peer");

                 goto out;

         }

         ret = dict_set_dynstr_with_alloc (dict, key, address->hostname);

         if (ret) {

-                gf_log (this->name, GF_LOG_ERROR,

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

+                        GD_MSG_DICT_SET_FAILED,

                         "Failed to set key %s in dict", key);

                 goto out;

         }

@@ -587,8 +595,9 @@ gd_add_friend_to_dict (glusterd_peerinfo_t *friend, dict_t *dict,

                 snprintf (key, sizeof (key), "%s.hostname%d", prefix, count);

                 ret = dict_set_dynstr_with_alloc (dict, key, address->hostname);

                 if (ret) {

-                        gf_log (this->name, GF_LOG_ERROR,

-                                        "Failed to set key %s in dict", key);

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

+                                GD_MSG_DICT_SET_FAILED,

+                                "Failed to set key %s in dict", key);

                         goto out;

                 }

                 count++;

@@ -597,11 +606,12 @@ gd_add_friend_to_dict (glusterd_peerinfo_t *friend, dict_t *dict,

         snprintf (key, sizeof (key), "%s.address-count", prefix);

         ret = dict_set_int32 (dict, key, count);

         if (ret)

-                gf_log (this->name, GF_LOG_ERROR,

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

+                        GD_MSG_DICT_SET_FAILED,

                         "Failed to set key %s in dict", key);

 out:

-        gf_log (this ? this->name : "glusterd", GF_LOG_DEBUG, "Returning %d",

+        gf_msg_debug (this ? this->name : "glusterd", 0, "Returning %d",

                 ret);

         return ret;

 }

@@ -631,7 +641,7 @@ gd_peerinfo_find_from_hostname (const char *hoststr)

                 cds_list_for_each_entry_rcu (tmphost, &peer->hostnames,

                                              hostname_list) {

                         if (!strncasecmp (tmphost->hostname, hoststr, 1024)) {

-                                gf_log (this->name, GF_LOG_DEBUG,

+                                gf_msg_debug (this->name, 0,

                                         "Friend %s found.. state: %d",

                                         tmphost->hostname, peer->state.state);

                                 found = peer; /* Probably needs to be

@@ -688,7 +698,7 @@ gd_peerinfo_find_from_addrinfo (const struct addrinfo *addr)

                                 /* Don't fail if getaddrinfo fails, continue

                                  * onto the next address

                                  */

-                                gf_log (this->name, GF_LOG_TRACE,

+                                gf_msg_trace (this->name, 0,

                                         "getaddrinfo for %s failed (%s)",

                                         address->hostname, gai_strerror (ret));

                                 ret = 0;

@@ -744,13 +754,15 @@ gd_update_peerinfo_from_dict (glusterd_peerinfo_t *peerinfo, dict_t *dict,

         snprintf (key, sizeof (key), "%s.hostname", prefix);

         ret = dict_get_str (dict, key, &hostname);

         if (ret) {

-                gf_log (this->name, GF_LOG_ERROR, "Key %s not present in "

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

+                        GD_MSG_DICT_GET_FAILED, "Key %s not present in "

                         "dictionary", key);

                 goto out;

         }

         ret = gd_add_address_to_peer (peerinfo, hostname);

         if (ret) {

-                gf_log (this->name, GF_LOG_ERROR,

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

+                        GD_MSG_ADD_ADDRESS_TO_PEER_FAIL,

                         "Could not add address to peer");

                 goto out;

         }

@@ -768,7 +780,8 @@ gd_update_peerinfo_from_dict (glusterd_peerinfo_t *peerinfo, dict_t *dict,

         snprintf (key, sizeof (key), "%s.address-count", prefix);

         ret = dict_get_int32 (dict, key, &count);

         if (ret) {

-                gf_log (this->name, GF_LOG_ERROR, "Key %s not present in "

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

+                        GD_MSG_DICT_GET_FAILED, "Key %s not present in "

                         "dictionary", key);

                 goto out;

         }

@@ -778,13 +791,15 @@ gd_update_peerinfo_from_dict (glusterd_peerinfo_t *peerinfo, dict_t *dict,

                 snprintf (key, sizeof (key), "%s.hostname%d",prefix, i);

                 ret = dict_get_str (dict, key, &hostname);

                 if (ret) {

-                        gf_log (this->name, GF_LOG_ERROR, "Key %s not present "

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

+                                GD_MSG_DICT_GET_FAILED, "Key %s not present "

                                 "in dictionary", key);

                         goto out;

                 }

                 ret = gd_add_address_to_peer (peerinfo, hostname);

                 if (ret) {

-                        gf_log (this->name, GF_LOG_ERROR,

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

+                                GD_MSG_ADD_ADDRESS_TO_PEER_FAIL,

                                 "Could not add address to peer");

                         goto out;

                 }

@@ -793,7 +808,7 @@ gd_update_peerinfo_from_dict (glusterd_peerinfo_t *peerinfo, dict_t *dict,

         }

 out:

-        gf_log (this->name, GF_LOG_DEBUG, "Returning %d", ret);

+        gf_msg_debug (this->name, 0, "Returning %d", ret);

         return ret;

 }

@@ -825,7 +840,9 @@ gd_peerinfo_from_dict (dict_t *dict, const char *prefix)

                                           0);

         if (new_peer == NULL) {

                 ret = -1;

-                gf_log (this->name, GF_LOG_ERROR, "Could not create peerinfo "

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

+                        GD_MSG_PEERINFO_CREATE_FAIL,

+                        "Could not create peerinfo "

                         "object");

                 goto out;

         }

@@ -833,7 +850,8 @@ gd_peerinfo_from_dict (dict_t *dict, const char *prefix)

         snprintf (key, sizeof (key), "%s.uuid", prefix);

         ret = dict_get_str (dict, key, &uuid_str);

         if (ret) {

-                gf_log (this->name, GF_LOG_ERROR, "Key %s not present in "

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

+                        GD_MSG_DICT_GET_FAILED, "Key %s not present in "

                         "dictionary", key);

                 goto out;

         }

diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c

index 82b2e57..23a60d2 100644

--- a/xlators/mgmt/glusterd/src/glusterd-utils.c

+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c

@@ -158,7 +158,8 @@ glusterd_lock (uuid_t   uuid)

         glusterd_get_lock_owner (&owner);

         if (!gf_uuid_is_null (owner)) {

-                gf_log (this->name, GF_LOG_ERROR, "Unable to get lock"

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

+                        GD_MSG_GLUSTERD_LOCK_FAIL, "Unable to get lock"

                         " for uuid: %s, lock held by: %s",

                         uuid_utoa_r (uuid, new_owner_str),

                         uuid_utoa_r (owner, owner_str));

@@ -168,7 +169,7 @@ glusterd_lock (uuid_t   uuid)

         ret = glusterd_set_lock_owner (uuid);

         if (!ret) {

-                gf_log (this->name, GF_LOG_DEBUG, "Cluster lock held by"

+                gf_msg_debug (this->name, 0, "Cluster lock held by"

                          " %s", uuid_utoa (uuid));

         }

@@ -194,23 +195,26 @@ glusterd_unlock (uuid_t uuid)

         glusterd_get_lock_owner (&owner);

         if (gf_uuid_is_null (owner)) {

-                gf_log (this->name, GF_LOG_ERROR, "Cluster lock not held!");

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

+                        GD_MSG_GLUSTERD_LOCK_FAIL, "Cluster lock not held!");

                 goto out;

         }

         ret = gf_uuid_compare (uuid, owner);

         if (ret) {

-               gf_log (this->name, GF_LOG_ERROR, "Cluster lock held by %s ,"

-                       "unlock req from %s!", uuid_utoa_r (owner ,owner_str)

-                        , uuid_utoa_r (uuid, new_owner_str));

-               goto out;

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

+                        GD_MSG_GLUSTERD_LOCK_FAIL, "Cluster lock held by %s ,"

+                        "unlock req from %s!", uuid_utoa_r (owner, owner_str),

+                        uuid_utoa_r (uuid, new_owner_str));

+                goto out;

         }

         ret = glusterd_unset_lock_owner (uuid);

         if (ret) {

-                gf_log (this->name, GF_LOG_ERROR, "Unable to clear cluster "

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

+                        GD_MSG_GLUSTERD_UNLOCK_FAIL, "Unable to clear cluster "

                         "lock");

                 goto out;

         }

@@ -340,7 +344,9 @@ glusterd_serialize_reply (rpcsvc_request_t *req, void *arg,

         rsp_size = xdr_sizeof (xdrproc, arg);

         iob = iobuf_get2 (req->svc->ctx->iobuf_pool, rsp_size);

         if (!iob) {

-                gf_log ("", GF_LOG_ERROR, "Failed to get iobuf");

+                gf_msg ("glusterd", GF_LOG_ERROR, ENOMEM,

+                        GD_MSG_NO_MEMORY,

+                        "Failed to get iobuf");

                 goto ret;

         }

@@ -353,7 +359,8 @@ glusterd_serialize_reply (rpcsvc_request_t *req, void *arg,

          */

         retlen = xdr_serialize_generic (*outmsg, arg, xdrproc);

         if (retlen == -1) {

-                gf_log ("", GF_LOG_ERROR, "Failed to encode message");

+                gf_msg ("glusterd", GF_LOG_ERROR, 0,

+                        GD_MSG_ENCODE_FAIL, "Failed to encode message");

                 goto ret;

         }

@@ -385,7 +392,8 @@ glusterd_submit_reply (rpcsvc_request_t *req, void *arg,

         if (!iobref) {

                 iobref = iobref_new ();

                 if (!iobref) {

-                        gf_log ("", GF_LOG_ERROR, "out of memory");

+                        gf_msg ("glusterd", GF_LOG_ERROR, ENOMEM,

+                                GD_MSG_NO_MEMORY, "out of memory");

                         goto out;

                 }

@@ -394,7 +402,8 @@ glusterd_submit_reply (rpcsvc_request_t *req, void *arg,

         iob = glusterd_serialize_reply (req, arg, &rsp, xdrproc);

         if (!iob) {

-                gf_log ("", GF_LOG_ERROR, "Failed to serialize reply");

+                gf_msg ("glusterd", GF_LOG_ERROR, 0,

+                        GD_MSG_SERIALIZE_MSG_FAIL, "Failed to serialize reply");

         } else {

                 iobref_add (iobref, iob);

         }

@@ -407,7 +416,8 @@ glusterd_submit_reply (rpcsvc_request_t *req, void *arg,

          * ref'ed the iob on receiving into the txlist.

          */

         if (ret == -1) {

-                gf_log ("", GF_LOG_ERROR, "Reply submission failed");

+                gf_msg ("glusterd", GF_LOG_ERROR, 0,

+                        GD_MSG_REPLY_SUBMIT_FAIL, "Reply submission failed");

                 goto out;

         }

@@ -516,7 +526,7 @@ glusterd_volinfo_new (glusterd_volinfo_t **volinfo)

         ret = 0;

 out:

-        gf_log (THIS->name, GF_LOG_DEBUG, "Returning %d", ret);

+        gf_msg_debug (THIS->name, 0, "Returning %d", ret);

         return ret;

 }

@@ -545,7 +555,8 @@ glusterd_volinfo_dup (glusterd_volinfo_t *volinfo,

         ret = glusterd_volinfo_new (&new_volinfo);

         if (ret) {

-                gf_log (this->name, GF_LOG_ERROR, "not able to create the "

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

+                        GD_MSG_VOLINFO_SET_FAIL, "not able to create the "

                         "duplicate volinfo for the volume %s",

                         volinfo->volname);

                 goto out;

@@ -613,7 +624,8 @@ glusterd_brickinfo_dup (glusterd_brickinfo_t *brickinfo,

         strcpy (dup_brickinfo->mnt_opts, brickinfo->mnt_opts);

         ret = gf_canonicalize_path (dup_brickinfo->path);

         if (ret) {

-                gf_log (THIS->name, GF_LOG_ERROR, "Failed to canonicalize "

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

+                        GD_MSG_CANONICALIZE_FAIL, "Failed to canonicalize "

                         "brick path");

                 goto out;

         }

@@ -739,7 +751,7 @@ glusterd_volume_brickinfos_delete (glusterd_volinfo_t *volinfo)

         }

 out:

-        gf_log (THIS->name, GF_LOG_DEBUG, "Returning %d", ret);

+        gf_msg_debug (THIS->name, 0, "Returning %d", ret);

         return ret;

 }

@@ -783,7 +795,7 @@ glusterd_volinfo_delete (glusterd_volinfo_t *volinfo)

         ret = 0;

 out:

-        gf_log (THIS->name, GF_LOG_DEBUG, "Returning %d", ret);

+        gf_msg_debug (THIS->name, 0, "Returning %d", ret);

         return ret;

 }

@@ -808,7 +820,7 @@ glusterd_brickinfo_new (glusterd_brickinfo_t **brickinfo)

         ret = 0;

 out:

-        gf_log (THIS->name, GF_LOG_DEBUG, "Returning %d", ret);

+        gf_msg_debug (THIS->name, 0, "Returning %d", ret);

         return ret;

 }

@@ -825,7 +837,8 @@ glusterd_get_next_available_brickid (glusterd_volinfo_t *volinfo)

                 token = strrchr (brickinfo->brick_id, '-');

                 ret = gf_string2int32 (++token, &brickid);

                 if (ret < 0) {

-                        gf_log (THIS->name, GF_LOG_ERROR,

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

+                                GD_MSG_BRICK_ID_GEN_FAILED,

                                 "Unable to generate brick ID");

                         return ret;

                 }

@@ -848,7 +861,7 @@ glusterd_resolve_brick (glusterd_brickinfo_t *brickinfo)

         GF_ASSERT (brickinfo);

         ret = glusterd_hostname_to_uuid (brickinfo->hostname, brickinfo->uuid);

-        gf_log (this->name, GF_LOG_DEBUG, "Returning %d", ret);

+        gf_msg_debug (this->name, 0, "Returning %d", ret);

         return ret;

 }

@@ -869,7 +882,8 @@ glusterd_get_brick_mount_dir (char *brickpath, char *hostname, char *mount_dir)

         ret = glusterd_hostname_to_uuid (hostname, brick_uuid);

         if (ret) {

-                gf_log (this->name, GF_LOG_ERROR,

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

+                        GD_MSG_HOSTNAME_TO_UUID_FAIL,

                         "Failed to convert hostname %s to uuid",

                         hostname);

                 goto out;

@@ -878,14 +892,16 @@ glusterd_get_brick_mount_dir (char *brickpath, char *hostname, char *mount_dir)

         if (!gf_uuid_compare (brick_uuid, MY_UUID)) {

                 ret = glusterd_get_brick_root (brickpath, &mnt_pt);

                 if (ret) {

-                        gf_log (this->name, GF_LOG_WARNING,

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

+                                GD_MSG_BRICKPATH_ROOT_GET_FAIL,

                                 "Could not get the root of the brick path %s",

                                 brickpath);

                         goto out;

                 }

                 if (strncmp (brickpath, mnt_pt, strlen(mnt_pt))) {

-                        gf_log (this->name, GF_LOG_WARNING,

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

+                                GD_MSG_BRKPATH_MNTPNT_MISMATCH,

                                 "brick: %s brick mount: %s",

                                 brickpath, mnt_pt);

                         ret = -1;

@@ -899,7 +915,7 @@ glusterd_get_brick_mount_dir (char *brickpath, char *hostname, char *mount_dir)

         }

 out:

-        gf_log (this->name, GF_LOG_TRACE, "Returning %d", ret);

+        gf_msg_trace (this->name, 0, "Returning %d", ret);

         return ret;

 }

@@ -961,7 +977,7 @@ out:

         if (tmp_host)

                 GF_FREE (tmp_path);

-        gf_log (this->name, GF_LOG_DEBUG, "Returning %d", ret);

+        gf_msg_debug (this->name, 0, "Returning %d", ret);

         return ret;

 }

@@ -1244,7 +1260,7 @@ glusterd_volume_brickinfo_get (uuid_t uuid, char *hostname, char *path,

                         continue;

                 if (strcmp (brickiter->path, path) == 0) {

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

+                        gf_msg_debug (this->name, 0, LOGSTR_FOUND_BRICK,

                                 brickiter->hostname, brickiter->path,

                                 volinfo->volname);

                         ret = 0;

@@ -1255,7 +1271,7 @@ glusterd_volume_brickinfo_get (uuid_t uuid, char *hostname, char *path,

         }

 out:

-        gf_log (this->name, GF_LOG_DEBUG, "Returning %d", ret);

+        gf_msg_debug (this->name, 0, "Returning %d", ret);

         return ret;

 }

@@ -1279,7 +1295,7 @@ glusterd_volume_brickinfo_get_by_brick (char *brick,

                                              brickinfo);

         (void) glusterd_brickinfo_delete (tmp_brickinfo);

 out:

-        gf_log ("", GF_LOG_DEBUG, "Returning %d", ret);

+        gf_msg_debug ("", 0, "Returning %d", ret);

         return ret;

 }

@@ -1319,7 +1335,7 @@ glusterd_volinfo_find_by_volume_id (uuid_t volume_id, glusterd_volinfo_t **volin

                         continue;

                 *volinfo = voliter;

                 ret = 0;

-                gf_log (this->name, GF_LOG_DEBUG, "Volume %s found",

+                gf_msg_debug (this->name, 0, "Volume %s found",

                         voliter->volname);

                 break;

         }

@@ -1343,7 +1359,7 @@ glusterd_volinfo_find (char *volname, glusterd_volinfo_t **volinfo)

         cds_list_for_each_entry (tmp_volinfo, &priv->volumes, vol_list) {

                 if (!strcmp (tmp_volinfo->volname, volname)) {

-                        gf_log (this->name, GF_LOG_DEBUG, "Volume %s found",

+                        gf_msg_debug (this->name, 0, "Volume %s found",

                                 volname);

                         ret = 0;

                         *volinfo = tmp_volinfo;

@@ -1351,7 +1367,7 @@ glusterd_volinfo_find (char *volname, glusterd_volinfo_t **volinfo)

                 }

         }

-        gf_log (this->name, GF_LOG_DEBUG, "Returning %d", ret);

+        gf_msg_debug (this->name, 0, "Returning %d", ret);

         return ret;

 }

@@ -1370,14 +1386,14 @@ glusterd_service_stop (const char *service, char *pidfile, int sig,

                 gf_log (this->name, GF_LOG_INFO, "%s already stopped", service);

                 goto out;

         }

-        gf_log (this->name, GF_LOG_DEBUG, "Stopping gluster %s running in pid: "

+        gf_msg_debug (this->name, 0, "Stopping gluster %s running in pid: "

                 "%d", service, pid);

         ret = kill (pid, sig);

         if (ret) {

                 switch (errno) {

                 case ESRCH:

-                        gf_log (this->name, GF_LOG_DEBUG, "%s is already stopped",

+                        gf_msg_debug (this->name, 0, "%s is already stopped",

                                 service);

                         ret = 0;

                         goto out;

@@ -1490,7 +1506,7 @@ glusterd_brick_connect (glusterd_volinfo_t  *volinfo,

         }

 out:

-        gf_log ("", GF_LOG_DEBUG, "Returning %d", ret);

+        gf_msg_debug ("", 0, "Returning %d", ret);

         return ret;

 }