From 3c0a03459e08568339195d14ffd2fef9acb89607 Mon Sep 17 00:00:00 2001

From: Manikandan Selvaganesh <mselvaga@redhat.com>

Date: Wed, 11 Mar 2015 20:11:09 +0530

Subject: [PATCH 082/101] protocol/server : port log messages to new framework

Change-Id: I7901f55d06716161cc31d2b79a600a16b5ec2ef8

BUG: 1231776

Signed-off-by: Manikandan Selvaganesh <mselvaga@redhat.com>

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

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

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

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

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

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

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

---

 xlators/protocol/server/src/Makefile.am        |    3 +-

 xlators/protocol/server/src/authenticate.c     |   29 +-

 xlators/protocol/server/src/server-handshake.c |  152 +++---

 xlators/protocol/server/src/server-helpers.c   |  107 ++--

 xlators/protocol/server/src/server-messages.h  |  796 ++++++++++++++++++++++++

 xlators/protocol/server/src/server-resolve.c   |   64 ++-

 xlators/protocol/server/src/server-rpc-fops.c  |  208 ++++---

 xlators/protocol/server/src/server.c           |  137 +++--

 8 files changed, 1202 insertions(+), 294 deletions(-)

 create mode 100644 xlators/protocol/server/src/server-messages.h

diff --git a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am

index 6a18bf0..c62d24f 100644

--- a/xlators/protocol/server/src/Makefile.am

+++ b/xlators/protocol/server/src/Makefile.am

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

 server_la_SOURCES = server.c server-resolve.c server-helpers.c  \

 	server-rpc-fops.c server-handshake.c authenticate.c

-noinst_HEADERS = server.h server-helpers.h server-mem-types.h authenticate.h

+noinst_HEADERS = server.h server-helpers.h server-mem-types.h authenticate.h \

+	server-messages.h

 AM_CPPFLAGS = $(GF_CPPFLAGS) \

 	-I$(top_srcdir)/libglusterfs/src \

diff --git a/xlators/protocol/server/src/authenticate.c b/xlators/protocol/server/src/authenticate.c

index d8d138a..8b45c41 100644

--- a/xlators/protocol/server/src/authenticate.c

+++ b/xlators/protocol/server/src/authenticate.c

@@ -23,6 +23,7 @@

 #include <dlfcn.h>

 #include <errno.h>

 #include "authenticate.h"

+#include "server-messages.h"

 static int

 init (dict_t *this, char *key, data_t *value, void *data)

@@ -38,9 +39,9 @@ init (dict_t *this, char *key, data_t *value, void *data)

         error = data;

         if (!strncasecmp (key, "ip", strlen ("ip"))) {

-                gf_log ("authenticate", GF_LOG_ERROR,

-                        "AUTHENTICATION MODULE \"IP\" HAS BEEN REPLACED "

-                        "BY \"ADDR\"");

+                gf_msg ("authenticate", GF_LOG_ERROR, 0,

+                        PS_MSG_AUTHENTICATE_ERROR, "AUTHENTICATION MODULE "

+                        "\"IP\" HAS BEEN REPLACED BY \"ADDR\"");

                 dict_set (this, key, data_from_dynptr (NULL, 0));

                 /* TODO: 1.3.x backword compatibility */

                 // *error = -1;

@@ -57,7 +58,8 @@ init (dict_t *this, char *key, data_t *value, void *data)

         handle = dlopen (auth_file, RTLD_LAZY);

         if (!handle) {

-                gf_log ("authenticate", GF_LOG_ERROR, "dlopen(%s): %s\n",

+                gf_msg ("authenticate", GF_LOG_ERROR, 0,

+                        PS_MSG_AUTHENTICATE_ERROR, "dlopen(%s): %s\n",

                         auth_file, dlerror ());

                 dict_set (this, key, data_from_dynptr (NULL, 0));

                 GF_FREE (auth_file);

@@ -68,8 +70,9 @@ init (dict_t *this, char *key, data_t *value, void *data)

         authenticate = dlsym (handle, "gf_auth");

         if (!authenticate) {

-                gf_log ("authenticate", GF_LOG_ERROR,

-                        "dlsym(gf_auth) on %s\n", dlerror ());

+                gf_msg ("authenticate", GF_LOG_ERROR, 0,

+                        PS_MSG_AUTHENTICATE_ERROR, "dlsym(gf_auth) on %s\n",

+                        dlerror ());

                 dict_set (this, key, data_from_dynptr (NULL, 0));

                 dlclose (handle);

                 *error = -1;

@@ -95,8 +98,8 @@ init (dict_t *this, char *key, data_t *value, void *data)

         }

         auth_handle->vol_opt->given_opt = dlsym (handle, "options");

         if (auth_handle->vol_opt->given_opt == NULL) {

-                gf_log ("authenticate", GF_LOG_DEBUG,

-                        "volume option validation not specified");

+                gf_msg_debug ("authenticate", 0, "volume option validation "

+                              "not specified");

         }

         auth_handle->authenticate = authenticate;

@@ -135,8 +138,9 @@ _gf_auth_option_validate (dict_t *d, char *k, data_t *v, void *tmp)

         ret = xlator_options_validate_list (xl, xl->options,

                                             handle->vol_opt, NULL);

         if (ret) {

-                gf_log ("authenticate", GF_LOG_ERROR,

-                        "volume option validation failed");

+                gf_msg ("authenticate", GF_LOG_ERROR, 0,

+                        PS_MSG_VOL_VALIDATE_FAILED, "volume option validation "

+                        "failed");

                 return -1;

         }

         return 0;

@@ -155,7 +159,8 @@ gf_auth_init (xlator_t *xl, dict_t *auth_modules)

 out:

         if (ret) {

-                gf_log (xl->name, GF_LOG_ERROR, "authentication init failed");

+                gf_msg (xl->name, GF_LOG_ERROR, 0, PS_MSG_AUTH_INIT_FAILED,

+                        "authentication init failed");

                 dict_foreach (auth_modules, fini, &ret;;

                 ret = -1;

         }

@@ -234,7 +239,7 @@ gf_authenticate (dict_t *input_params,

                         name = peerinfo_data->data;

                 }

-                gf_log ("auth", GF_LOG_ERROR,

+                gf_msg ("auth", GF_LOG_ERROR, 0, PS_MSG_REMOTE_CLIENT_REFUSED,

                         "no authentication module is interested in "

                         "accepting remote-client %s", name);

                 result = AUTH_REJECT;

diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c

index 262df6a..556b0e2 100644

--- a/xlators/protocol/server/src/server-handshake.c

+++ b/xlators/protocol/server/src/server-handshake.c

@@ -21,6 +21,7 @@

 #include "compat-errno.h"

 #include "glusterfs3.h"

 #include "authenticate.h"

+#include "server-messages.h"

 struct __get_xl_struct {

         const char *name;

@@ -94,7 +95,7 @@ _volfile_update_checksum (xlator_t *this, char *key, uint32_t checksum)

         }

         if (temp_volfile->checksum != checksum) {

-                gf_log (this->name, GF_LOG_INFO,

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

                         "the volume file was modified between a prior access "

                         "and now. This may lead to inconsistency between "

                         "clients, you are advised to remount client");

@@ -122,7 +123,7 @@ getspec_build_volfile_path (xlator_t *this, const char *key, char *path,

         ret = dict_get_str (this->options, "client-volume-filename",

                             &filename);

         if (ret == 0) {

-                gf_log (this->name, GF_LOG_WARNING,

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

                         "option 'client-volume-filename' is changed to "

                         "'volume-filename.<key>' which now takes 'key' as an "

                         "option to choose/fetch different files from server. "

@@ -137,8 +138,9 @@ getspec_build_volfile_path (xlator_t *this, const char *key, char *path,

                 if (ret < 0) {

                         /* Make sure that key doesn't contain "../" in path */

                         if ((gf_strstr (key, "/", "..")) == -1) {

-                                gf_log (this->name, GF_LOG_ERROR,

-                                        "%s: invalid key", key);

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

+                                        PS_MSG_INVALID_ENTRY, "%s: invalid "

+                                        "key", key);

                                 goto out;

                         }

                 }

@@ -148,9 +150,9 @@ getspec_build_volfile_path (xlator_t *this, const char *key, char *path,

                 ret = dict_get_str (this->options,

                                     "volume-filename.default", &filename);

                 if (ret < 0) {

-                        gf_log (this->name, GF_LOG_DEBUG,

-                                "no default volume filename given, "

-                                "defaulting to %s", DEFAULT_VOLUME_FILE_PATH);

+                        gf_msg_debug (this->name, 0, "no default volume "

+                                      "filename given, defaulting to %s",

+                                      DEFAULT_VOLUME_FILE_PATH);

                 }

         }

@@ -203,7 +205,8 @@ _validate_volfile_checksum (xlator_t *this, char *key,

                 fd = open (filename, O_RDONLY);

                 if (-1 == fd) {

                         ret = 0;

-                        gf_log (this->name, GF_LOG_INFO,

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

+                                PS_MSG_VOL_FILE_OPEN_FAILED,

                                 "failed to open volume file (%s) : %s",

                                 filename, strerror (errno));

                         goto out;

@@ -271,8 +274,8 @@ server_getspec (rpcsvc_request_t *req)

                 /* to allocate the proper buffer to hold the file data */

                 ret = stat (filename, &stbuf);

                 if (ret < 0){

-                        gf_log (this->name, GF_LOG_ERROR,

-                                "Unable to stat %s (%s)",

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

+                                PS_MSG_STAT_ERROR, "Unable to stat %s (%s)",

                                 filename, strerror (errno));

                         op_errno = errno;

                         goto fail;

@@ -280,9 +283,9 @@ server_getspec (rpcsvc_request_t *req)

                 spec_fd = open (filename, O_RDONLY);

                 if (spec_fd < 0) {

-                        gf_log (this->name, GF_LOG_ERROR,

-                                "Unable to open %s (%s)",

-                                filename, strerror (errno));

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

+                                PS_MSG_FILE_OP_FAILED, "Unable to open %s "

+                                "(%s)", filename, strerror (errno));

                         op_errno = errno;

                         goto fail;

                 }

@@ -382,10 +385,9 @@ server_setvolume (rpcsvc_request_t *req)

                                     "Internal error: failed to unserialize "

                                     "request dictionary");

                 if (ret < 0)

-                        gf_log (this->name, GF_LOG_DEBUG,

-                                "failed to set error msg \"%s\"",

-                                "Internal error: failed to unserialize "

-                                "request dictionary");

+                        gf_msg_debug (this->name, 0, "failed to set error "

+                                      "msg \"%s\"", "Internal error: failed "

+                                      "to unserialize request dictionary");

                 op_ret = -1;

                 op_errno = EINVAL;

@@ -400,8 +402,8 @@ server_setvolume (rpcsvc_request_t *req)

                 ret = dict_set_str (reply, "ERROR",

                                     "UUID not specified");

                 if (ret < 0)

-                        gf_log (this->name, GF_LOG_DEBUG,

-                                "failed to set error msg");

+                        gf_msg_debug (this->name, 0, "failed to set error "

+                                      "msg");

                 op_ret = -1;

                 op_errno = EINVAL;

@@ -414,8 +416,8 @@ server_setvolume (rpcsvc_request_t *req)

                 ret = dict_set_str (reply, "ERROR",

                                     "lock state version not supplied");

                 if (ret < 0)

-                        gf_log (this->name, GF_LOG_DEBUG,

-                                "failed to set error msg");

+                        gf_msg_debug (this->name, 0, "failed to set error "

+                                      "msg");

                 op_ret = -1;

                 op_errno = EINVAL;

@@ -429,14 +431,16 @@ server_setvolume (rpcsvc_request_t *req)

                 goto fail;

         }

-        gf_log (this->name, GF_LOG_DEBUG, "Connected to %s", client->client_uid);

+        gf_msg_debug (this->name, 0, "Connected to %s", client->client_uid);

         cancelled = server_cancel_grace_timer (this, client);

         if (cancelled)//Do gf_client_put on behalf of grace-timer-handler.

                 gf_client_put (client, NULL);

         serv_ctx = server_ctx_get (client, client->this);

         if (serv_ctx == NULL) {

-                gf_log (this->name, GF_LOG_INFO, "server_ctx_get() failed");

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

+                        PS_MSG_SERVER_CTX_GET_FAILED, "server_ctx_get() "

+                        "failed");

                 goto fail;

         }

@@ -452,8 +456,9 @@ server_setvolume (rpcsvc_request_t *req)

         auth_set_username_passwd (params, config_params, client);

         if (req->trans->ssl_name) {

                 if (dict_set_str(params,"ssl-name",req->trans->ssl_name) != 0) {

-                        gf_log (this->name, GF_LOG_WARNING,

-                                "failed to set ssl_name %s", req->trans->ssl_name);

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

+                                PS_MSG_SSL_NAME_SET_FAILED, "failed to set "

+                                "ssl_name %s", req->trans->ssl_name);

                         /* Not fatal, auth will just fail. */

                 }

         }

@@ -463,8 +468,8 @@ server_setvolume (rpcsvc_request_t *req)

                 ret = dict_set_str (reply, "ERROR",

                                     "No FOP version number specified");

                 if (ret < 0)

-                        gf_log (this->name, GF_LOG_DEBUG,

-                                "failed to set error msg");

+                        gf_msg_debug (this->name, 0, "failed to set error "

+                                      "msg");

         }

         ret = dict_get_int32 (params, "mgmt-version", &mgmt_version);

@@ -472,8 +477,8 @@ server_setvolume (rpcsvc_request_t *req)

                 ret = dict_set_str (reply, "ERROR",

                                     "No MGMT version number specified");

                 if (ret < 0)

-                        gf_log (this->name, GF_LOG_DEBUG,

-                                "failed to set error msg");

+                        gf_msg_debug (this->name, 0, "failed to set error "

+                                      "msg");

         }

         ret = gf_compare_client_version (req, fop_version, mgmt_version);

@@ -483,14 +488,15 @@ server_setvolume (rpcsvc_request_t *req)

                                    fop_version, mgmt_version);

                 /* get_supported_version (req)); */

                 if (-1 == ret) {

-                        gf_log (this->name, GF_LOG_ERROR,

-                                "asprintf failed while setting up error msg");

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

+                                PS_MSG_ASPRINTF_FAILED, "asprintf failed while"

+                                "setting up error msg");

                         goto fail;

                 }

                 ret = dict_set_dynstr (reply, "ERROR", msg);

                 if (ret < 0)

-                        gf_log (this->name, GF_LOG_DEBUG,

-                                "failed to set error msg");

+                        gf_msg_debug (this->name, 0, "failed to set error "

+                                      "msg");

                 op_ret = -1;

                 op_errno = EINVAL;

@@ -502,8 +508,8 @@ server_setvolume (rpcsvc_request_t *req)

                 ret = dict_set_str (reply, "ERROR",

                                     "No remote-subvolume option specified");

                 if (ret < 0)

-                        gf_log (this->name, GF_LOG_DEBUG,

-                                "failed to set error msg");

+                        gf_msg_debug (this->name, 0, "failed to set error "

+                                      "msg");

                 op_ret = -1;

                 op_errno = EINVAL;

@@ -515,14 +521,15 @@ server_setvolume (rpcsvc_request_t *req)

                 ret = gf_asprintf (&msg, "remote-subvolume \"%s\" is not found",

                                    name);

                 if (-1 == ret) {

-                        gf_log (this->name, GF_LOG_ERROR,

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

+                                PS_MSG_ASPRINTF_FAILED,

                                 "asprintf failed while setting error msg");

                         goto fail;

                 }

                 ret = dict_set_dynstr (reply, "ERROR", msg);

                 if (ret < 0)

-                        gf_log (this->name, GF_LOG_DEBUG,

-                                "failed to set error msg");

+                        gf_msg_debug (this->name, 0, "failed to set error "

+                                      "msg");

                 op_ret = -1;

                 op_errno = ENOENT;

@@ -535,8 +542,8 @@ server_setvolume (rpcsvc_request_t *req)

                         ret = dict_get_str (params, "volfile-key",

                                             &volfile_key);

                         if (ret)

-                                gf_log (this->name, GF_LOG_DEBUG,

-                                        "failed to set 'volfile-key'");

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

+                                              "'volfile-key'");

                         ret = _validate_volfile_checksum (this, volfile_key,

                                                           checksum);

@@ -546,8 +553,8 @@ server_setvolume (rpcsvc_request_t *req)

                                                     "varies from earlier "

                                                     "access");

                                 if (ret < 0)

-                                        gf_log (this->name, GF_LOG_DEBUG,

-                                                "failed to set error msg");

+                                        gf_msg_debug (this->name, 0, "failed "

+                                                      "to set error msg");

                                 op_ret   = -1;

                                 op_errno = ESTALE;

@@ -561,25 +568,26 @@ server_setvolume (rpcsvc_request_t *req)

         if (peerinfo) {

                 ret = dict_set_static_ptr (params, "peer-info", peerinfo);

                 if (ret < 0)

-                        gf_log (this->name, GF_LOG_DEBUG,

-                                "failed to set peer-info");

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

+                                      "peer-info");

         }

         if (conf->auth_modules == NULL) {

-                gf_log (this->name, GF_LOG_ERROR,

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

                         "Authentication module not initialized");

         }

         ret = dict_get_str (params, "client-version", &clnt_version);

         if (ret)

-                gf_log (this->name, GF_LOG_INFO, "client-version not set, "

-                        "may be of older version");

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

+                        PS_MSG_CLIENT_VERSION_NOT_SET,

+                        "client-version not set, may be of older version");

         ret = gf_authenticate (params, config_params,

                                conf->auth_modules);

         if (ret == AUTH_ACCEPT) {

-                gf_log (this->name, GF_LOG_INFO,

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

                         "accepted client from %s (version: %s)",

                         client->client_uid,

                         (clnt_version) ? clnt_version : "old");

@@ -587,20 +595,20 @@ server_setvolume (rpcsvc_request_t *req)

                 client->bound_xl = xl;

                 ret = dict_set_str (reply, "ERROR", "Success");

                 if (ret < 0)

-                        gf_log (this->name, GF_LOG_DEBUG,

-                                "failed to set error msg");

+                        gf_msg_debug (this->name, 0, "failed to set error "

+                                      "msg");

         } else {

-                gf_log (this->name, GF_LOG_ERROR,

-                        "Cannot authenticate client from %s %s",

-                        client->client_uid,

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

+                        PS_MSG_AUTHENTICATE_ERROR, "Cannot authenticate client"

+                        " from %s %s", client->client_uid,

                         (clnt_version) ? clnt_version : "old");

                 op_ret = -1;

                 op_errno = EACCES;

                 ret = dict_set_str (reply, "ERROR", "Authentication failed");

                 if (ret < 0)

-                        gf_log (this->name, GF_LOG_DEBUG,

-                                "failed to set error msg");

+                        gf_msg_debug (this->name, 0, "failed to set error "

+                                      "msg");

                 goto fail;

         }

@@ -609,8 +617,8 @@ server_setvolume (rpcsvc_request_t *req)

                                     "Check volfile and handshake "

                                     "options in protocol/client");

                 if (ret < 0)

-                        gf_log (this->name, GF_LOG_DEBUG,

-                                "failed to set error msg");

+                        gf_msg_debug (this->name, 0, "failed to set error "

+                                      "msg");

                 op_ret = -1;

                 op_errno = EACCES;

@@ -623,10 +631,9 @@ server_setvolume (rpcsvc_request_t *req)

                 /* create inode table for this bound_xl, if one doesn't

                    already exist */

-                gf_log (this->name, GF_LOG_TRACE,

-                        "creating inode table with lru_limit=%"PRId32", "

-                        "xlator=%s", conf->inode_lru_limit,

-                        client->bound_xl->name);

+                gf_msg_trace (this->name, 0, "creating inode table with "

+                              "lru_limit=%"PRId32", xlator=%s",

+                              conf->inode_lru_limit, client->bound_xl->name);

                 /* TODO: what is this ? */

                 client->bound_xl->itable =

@@ -637,25 +644,24 @@ server_setvolume (rpcsvc_request_t *req)

         ret = dict_set_str (reply, "process-uuid",

                             this->ctx->process_uuid);

         if (ret)

-                gf_log (this->name, GF_LOG_DEBUG,

-                        "failed to set 'process-uuid'");

+                gf_msg_debug (this->name, 0, "failed to set 'process-uuid'");

         ret = dict_set_uint32 (reply, "clnt-lk-version", serv_ctx->lk_version);

         if (ret)

-                gf_log (this->name, GF_LOG_WARNING,

-                        "failed to set 'clnt-lk-version'");

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

+                        PS_MSG_CLIENT_LK_VERSION_ERROR, "failed to set "

+                        "'clnt-lk-version'");

         ret = dict_set_uint64 (reply, "transport-ptr",

                                ((uint64_t) (long) req->trans));

         if (ret)

-                gf_log (this->name, GF_LOG_DEBUG,

-                        "failed to set 'transport-ptr'");

+                gf_msg_debug (this->name, 0, "failed to set 'transport-ptr'");

 fail:

         rsp.dict.dict_len = dict_serialized_length (reply);

         if (rsp.dict.dict_len > UINT_MAX) {

-                gf_log ("server-handshake", GF_LOG_DEBUG,

-                        "failed to get serialized length of reply dict");

+                gf_msg_debug ("server-handshake", 0, "failed to get serialized"

+                               " length of reply dict");

                 op_ret   = -1;

                 op_errno = EINVAL;

                 rsp.dict.dict_len = 0;

@@ -667,8 +673,8 @@ fail:

                 if (rsp.dict.dict_val) {

                         ret = dict_serialize (reply, rsp.dict.dict_val);

                         if (ret < 0) {

-                                gf_log ("server-handshake", GF_LOG_DEBUG,

-                                        "failed to serialize reply dict");

+                                gf_msg_debug ("server-handshake", 0, "failed "

+                                              "to serialize reply dict");

                                 op_ret = -1;

                                 op_errno = -ret;

                         }

@@ -752,7 +758,9 @@ server_set_lk_version (rpcsvc_request_t *req)

         client = gf_client_get (this, &req->cred, args.uid);

         serv_ctx = server_ctx_get (client, client->this);

         if (serv_ctx == NULL) {

-                gf_log (this->name, GF_LOG_INFO, "server_ctx_get() failed");

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

+                        PS_MSG_SERVER_CTX_GET_FAILED, "server_ctx_get() "

+                        "failed");

                 goto fail;

         }

diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c

index 545be6e..24d617f 100644

--- a/xlators/protocol/server/src/server-helpers.c

+++ b/xlators/protocol/server/src/server-helpers.c

@@ -16,6 +16,7 @@

 #include "server.h"

 #include "server-helpers.h"

 #include "gidcache.h"

+#include "server-messages.h"

 #include <fnmatch.h>

 #include <pwd.h>

@@ -42,25 +43,27 @@ gid_resolve (server_conf_t *conf, call_stack_t *root)

         ret = getpwuid_r (root->uid, &mypw, mystrs, sizeof(mystrs), &result);

         if (ret != 0) {

-                gf_log("gid-cache", GF_LOG_ERROR, "getpwuid_r(%u) failed",

-                       root->uid);

+                gf_msg ("gid-cache", GF_LOG_ERROR, errno,

+                        PS_MSG_GET_UID_FAILED, "getpwuid_r(%u) failed",

+                        root->uid);

                 return -1;

         }

         if (!result) {

-                gf_log ("gid-cache", GF_LOG_ERROR, "getpwuid_r(%u) found "

-                        "nothing", root->uid);

+                gf_msg ("gid-cache", GF_LOG_ERROR, 0, PS_MSG_UID_NOT_FOUND,

+                        "getpwuid_r(%u) found nothing", root->uid);

                 return -1;

         }

-        gf_log ("gid-cache", GF_LOG_TRACE, "mapped %u => %s", root->uid,

-                result->pw_name);

+        gf_msg_trace ("gid-cache", 0, "mapped %u => %s", root->uid,

+                      result->pw_name);

         ngroups = GF_MAX_AUX_GROUPS;

         ret = getgrouplist (result->pw_name, root->gid, mygroups, &ngroups);

         if (ret == -1) {

-                gf_log ("gid-cache", GF_LOG_ERROR, "could not map %s to group "

-                        "list (%d gids)", result->pw_name, root->ngrps);

+                gf_msg ("gid-cache", GF_LOG_ERROR, 0, PS_MSG_MAPPING_ERROR,

+                        "could not map %s to group list (%d gids)",

+                        result->pw_name, root->ngrps);

                 return -1;

         }

         root->ngrps = (uint16_t) ngroups;

@@ -286,12 +289,14 @@ do_fd_cleanup (xlator_t *this, client_t* client, fdentry_t *fdentries, int fd_co

                         ret = inode_path (fd->inode, NULL, &path);

                         if (ret > 0) {

-                                gf_log (this->name, GF_LOG_INFO,

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

+                                        PS_MSG_FD_CLEANUP,

                                         "fd cleanup on %s", path);

                                 GF_FREE (path);

                         }  else {

-                                gf_log (this->name, GF_LOG_INFO,

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

+                                        PS_MSG_FD_CLEANUP,

                                         "fd cleanup on inode with gfid %s",

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

                         }

@@ -334,7 +339,9 @@ server_connection_cleanup (xlator_t *this, client_t *client,

         serv_ctx = server_ctx_get (client, client->this);

         if (serv_ctx == NULL) {

-                gf_log (this->name, GF_LOG_INFO, "server_ctx_get() failed");

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

+                        PS_MSG_SERVER_CTX_GET_FAILED, "server_ctx_get() "

+                        "failed");

                 goto out;

         }

@@ -356,7 +363,8 @@ server_connection_cleanup (xlator_t *this, client_t *client,

         if (fdentries != NULL)

                 ret = do_fd_cleanup (this, client, fdentries, fd_count);

         else

-                gf_log (this->name, GF_LOG_INFO, "no fdentries to clean");

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

+                        "no fdentries to clean");

         if (cd_ret || ret)

                 ret = -1;

@@ -521,9 +529,9 @@ server_build_config (xlator_t *this, server_conf_t *conf)

         if (data) {

                 ret = gf_string2boolean(data->data, &conf->verify_volfile);

                 if (ret != 0) {

-                        gf_log (this->name, GF_LOG_WARNING,

-                                "wrong value for 'verify-volfile-checksum', "

-                                "Neglecting option");

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

+                                PS_MSG_INVALID_ENTRY, "wrong value for '"

+                                "verify-volfile-checksum', Neglecting option");

                 }

         }

@@ -531,9 +539,9 @@ server_build_config (xlator_t *this, server_conf_t *conf)

         if (data) {

                 ret = gf_string2boolean (data->data, &conf->trace);

                 if (ret != 0) {

-                        gf_log (this->name, GF_LOG_WARNING,

-                                "'trace' takes on only boolean values. "

-                                "Neglecting option");

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

+                                PS_MSG_INVALID_ENTRY, "'trace' takes on only "

+                                "boolean values. Neglecting option");

                 }

         }

@@ -541,9 +549,8 @@ server_build_config (xlator_t *this, server_conf_t *conf)

         ret = dict_get_int32 (this->options, "limits.transaction-size",

                               &conf->rpc_conf.max_block_size);

         if (ret < 0) {

-                gf_log (this->name, GF_LOG_TRACE,

-                        "defaulting limits.transaction-size to %d",

-                        DEFAULT_BLOCK_SIZE);

+                gf_msg_trace (this->name, 0, "defaulting limits.transaction-"

+                              "size to %d", DEFAULT_BLOCK_SIZE);

                 conf->rpc_conf.max_block_size = DEFAULT_BLOCK_SIZE;

         }

@@ -553,16 +560,17 @@ server_build_config (xlator_t *this, server_conf_t *conf)

                    or directory specified is non standard */

                 ret = stat (data->data, &buf;;

                 if ((ret != 0) || !S_ISDIR (buf.st_mode)) {

-                        gf_log (this->name, GF_LOG_ERROR,

-                                "Directory '%s' doesn't exist, exiting.",

-                                data->data);

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

+                                PS_MSG_DIR_NOT_FOUND, "Directory '%s' doesn't "

+                                "exist, exiting.", data->data);

                         ret = -1;

                         goto out;

                 }

                 /* Make sure that conf-dir doesn't contain ".." in path */

                 if ((gf_strstr (data->data, "/", "..")) == -1) {

                         ret = -1;

-                        gf_log (this->name, GF_LOG_ERROR,

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

+                                PS_MSG_CONF_DIR_INVALID,

                                 "%s: invalid conf_dir", data->data);

                         goto out;

                 }

@@ -759,9 +767,8 @@ server_print_reply (call_frame_t *frame, int op_ret, int op_errno)

         if (state->fd)

                 snprintf (fdstr, 32, " fd=%p", state->fd);

-        gf_log (this->name, GF_LOG_INFO,

-                "%s%s => (%d, %d)%s",

-                op, caller, op_ret, op_errno, fdstr);

+        gf_msg (this->name, GF_LOG_INFO, op_errno, PS_MSG_SERVER_MSG,

+                "%s%s => (%d, %d)%s", op, caller, op_ret, op_errno, fdstr);

 out:

         return;

 }

@@ -822,9 +829,8 @@ server_print_request (call_frame_t *frame)

                 break;

         }

-        gf_log (this->name, GF_LOG_INFO,

-                "%s%s%s%s%s%s%s",

-                op, caller,

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

+                "%s%s%s%s%s%s%s", op, caller,

                 resolve_vars, loc_vars, resolve2_vars, loc2_vars, other_vars);

 out:

         return;

@@ -859,9 +865,9 @@ serialize_rsp_direntp (gf_dirent_t *entries, gfs3_readdirp_rsp *rsp)

                 if (entry->dict) {

                         trav->dict.dict_len = dict_serialized_length (entry->dict);

                         if (trav->dict.dict_len > UINT_MAX) {

-                                gf_log (THIS->name, GF_LOG_ERROR,

-                                        "failed to get serialized length "

-                                        "of reply dict");

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

+                                        PS_MSG_INVALID_ENTRY, "failed to get "

+                                        "serialized length of reply dict");

                                 errno = EINVAL;

                                 trav->dict.dict_len = 0;

                                 goto out;

@@ -877,7 +883,8 @@ serialize_rsp_direntp (gf_dirent_t *entries, gfs3_readdirp_rsp *rsp)

                         ret = dict_serialize (entry->dict, trav->dict.dict_val);

                         if (ret < 0) {

-                                gf_log (THIS->name, GF_LOG_ERROR,

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

+                                        PS_MSG_DICT_SERIALIZE_FAIL,

                                         "failed to serialize reply dict");

                                 errno = -ret;

                                 trav->dict.dict_len = 0;

@@ -989,7 +996,8 @@ gf_server_check_getxattr_cmd (call_frame_t *frame, const char *key)

                 pthread_mutex_lock (&conf->mutex);

                 {