diff options
| author | Nandaja Varma <nandaja.varma@gmail.com> | 2015-03-23 11:36:37 +0530 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2015-06-11 07:20:33 -0700 |
| commit | 9863c8940936989d2ffb3c8ac28431d2b313384d (patch) | |
| tree | ef908a8d0503b905eb56775d9cee108fddec0d46 | |
| parent | a6c53571a9a7c74d0fa2683b4ba04682bd6a46ad (diff) | |
utils/glusterd: Porting to new logging framwork
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>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-messages.h | 90 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-peer-utils.c | 76 | ||||
| -rw-r--r-- | 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 d7fb299e91f..55991ace016 100644 --- a/xlators/mgmt/glusterd/src/glusterd-messages.h +++ b/xlators/mgmt/glusterd/src/glusterd-messages.h @@ -40,7 +40,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" @@ -3621,6 +3621,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 9a05941a3f3..51003fb44eb 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 996cf89bb4a..12cb0730960 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -154,7 +154,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)); @@ -164,7 +165,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)); } @@ -190,23 +191,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; } @@ -336,7 +340,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; } @@ -349,7 +355,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; } @@ -381,7 +388,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; } @@ -390,7 +398,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); } @@ -403,7 +412,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; } @@ -512,7 +522,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; } @@ -541,7 +551,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; @@ -609,7 +620,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; } @@ -735,7 +747,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; } @@ -779,7 +791,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; } @@ -804,7 +816,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; } @@ -821,7 +833,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; } @@ -844,7 +857,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; } @@ -865,7 +878,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; @@ -874,14 +888,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; @@ -895,7 +911,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; } @@ -957,7 +973,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; } @@ -1240,7 +1256,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; @@ -1251,7 +1267,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; } @@ -1275,7 +1291,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; } @@ -1315,7 +1331,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; } @@ -1339,7 +1355,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; @@ -1347,7 +1363,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; } @@ -1366,14 +1382,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; @@ -1486,7 +1502,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; } @@ -1505,7 +1521,8 @@ _mk_rundir_p (glusterd_volinfo_t *volinfo) snprintf (rundir, sizeof (rundir)-1, "%s/run", voldir); ret = mkdir_p (rundir, 0777, _gf_true); if (ret) - gf_log (this->name, GF_LOG_ERROR, "Failed to create rundir"); + gf_msg (this->name, GF_LOG_ERROR, errno, + GD_MSG_CREATE_DIR_FAILED, "Failed to create rundir"); return ret; } @@ -1672,7 +1689,8 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t *volinfo, connect: ret = glusterd_brick_connect (volinfo, brickinfo, socketpath); if (ret) { - gf_log (this->name, GF_LOG_ERROR, + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_BRICK_DISCONNECTED, "Failed to connect to brick %s:%s on %s", brickinfo->hostname, brickinfo->path, socketpath); goto out; @@ -1823,7 +1841,8 @@ glusterd_readin_file (const char *filepath, int *line_count) out: if (ret) - gf_log (THIS->name, GF_LOG_ERROR, "%s", strerror (errno)); + gf_msg (THIS->name, GF_LOG_ERROR, errno, + GD_MSG_READIN_FILE_FAILED, "%s", strerror (errno)); if (fp) fclose (fp); @@ -1895,7 +1914,8 @@ glusterd_volume_compute_cksum (glusterd_volinfo_t *volinfo, char *cksum_path, fd = open (cksum_path, O_RDWR | O_APPEND | O_CREAT| O_TRUNC, 0600); if (-1 == fd) { - gf_log (this->name, GF_LOG_ERROR, "Unable to open %s," + gf_msg (this->name, GF_LOG_ERROR, errno, + GD_MSG_FILE_OP_FAILED, "Unable to open %s," " errno: %d", cksum_path, errno); ret = -1; goto out; @@ -1907,7 +1927,8 @@ glusterd_volume_compute_cksum (glusterd_volinfo_t *volinfo, char *cksum_path, sort_fd = mkstemp (sort_filepath); if (sort_fd < 0) { - gf_log (this->name, GF_LOG_ERROR, "Could not generate " + gf_msg (this->name, GF_LOG_ERROR, errno, + GD_MSG_FILE_OP_FAILED, "Could not generate " "temp file, reason: %s for volume: %s", strerror (errno), volinfo->volname); goto out; @@ -1919,7 +1940,8 @@ glusterd_volume_compute_cksum (glusterd_volinfo_t *volinfo, char *cksum_path, ret = glusterd_sort_and_redirect (filepath, sort_fd); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "sorting info file " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_FILE_OP_FAILED, "sorting info file " "failed"); goto out; } @@ -1933,7 +1955,8 @@ glusterd_volume_compute_cksum (glusterd_volinfo_t *volinfo, char *cksum_path, ret = get_checksum_for_path (cksum_path_final, &cksum); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "unable to get " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_CKSUM_GET_FAIL, "unable to get " "checksum for path: %s", cksum_path_final); goto out; } @@ -1957,7 +1980,7 @@ out: close (fd); if (unlink_sortfile) unlink (sort_filepath); - gf_log (this->name, GF_LOG_DEBUG, "Returning with %d", ret); + gf_msg_debug (this->name, 0, "Returning with %d", ret); return ret; } @@ -1995,7 +2018,8 @@ int glusterd_compute_cksum (glusterd_volinfo_t *volinfo, ret = glusterd_volume_compute_cksum (volinfo, cksum_path, filepath, is_quota_conf, &cs); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to compute checksum " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_CKSUM_COMPUTE_FAIL, "Failed to compute checksum " "for volume %s", volinfo->volname); goto out; } @@ -2022,13 +2046,16 @@ _add_dict_to_prdict (dict_t *this, char *key, data_t *value, void *data) ctx->key_name, ctx->opt_count); ret = dict_set_str (ctx->dict, optkey, key); if (ret) - gf_log ("", GF_LOG_ERROR, "option add for %s%d %s", + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, "option add for %s%d %s", ctx->key_name, ctx->opt_count, key); snprintf (optkey, sizeof (optkey), "%s.%s%d", ctx->prefix, ctx->val_name, ctx->opt_count); ret = dict_set_str (ctx->dict, optkey, value->data); if (ret) - gf_log ("", GF_LOG_ERROR, "option add for %s%d %s", + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, + "option add for %s%d %s", ctx->val_name, ctx->opt_count, value->data); ctx->opt_count++; @@ -2402,7 +2429,7 @@ out: GF_FREE (rebalance_id_str); GF_FREE (rb_id_str); - gf_log (this->name, GF_LOG_DEBUG, "Returning with %d", ret); + gf_msg_debug (this->name, 0, "Returning with %d", ret); return ret; } @@ -2446,7 +2473,8 @@ glusterd_vol_add_quota_conf_to_dict (glusterd_volinfo_t *volinfo, dict_t* load, if (ret == 0) { break; } else if (ret < 0) { - gf_log (this->name, GF_LOG_CRITICAL, "Quota " + gf_msg (this->name, GF_LOG_CRITICAL, 0, + GD_MSG_QUOTA_CONF_CORRUPT, "Quota " "configuration store may be corrupt."); goto out; } @@ -2543,7 +2571,7 @@ out: if (ret) dict_unref (dict); - gf_log (this->name, GF_LOG_TRACE, "Returning %d", ret); + gf_msg_trace (this->name, 0, "Returning %d", ret); return ret; } @@ -2623,7 +2651,7 @@ glusterd_compare_friend_volume (dict_t *peer_data, int32_t count, snprintf (key, sizeof (key), "volume%d.quota-version", count); ret = dict_get_uint32 (peer_data, key, "a_version); if (ret) { - gf_log (this->name, GF_LOG_DEBUG, "quota-version key absent for" + gf_msg_debug (this->name, 0, "quota-version key absent for" " volume %s in peer %s's response", volinfo->volname, hostname); ret = 0; @@ -2652,7 +2680,7 @@ glusterd_compare_friend_volume (dict_t *peer_data, int32_t count, snprintf (key, sizeof (key), "volume%d.quota-cksum", count); ret = dict_get_uint32 (peer_data, key, "a_cksum); if (ret) { - gf_log (this->name, GF_LOG_DEBUG, "quota checksum absent for " + gf_msg_debug (this->name, 0, "quota checksum absent for " "volume %s in peer %s's response", volinfo->volname, hostname); ret = 0; @@ -2672,7 +2700,7 @@ glusterd_compare_friend_volume (dict_t *peer_data, int32_t count, *status = GLUSTERD_VOL_COMP_SCS; out: - gf_log (this->name, GF_LOG_DEBUG, "Returning with ret: %d, status: %d", + gf_msg_debug (this->name, 0, "Returning with ret: %d, status: %d", ret, *status); return ret; } @@ -2725,8 +2753,9 @@ import_prdict_dict (dict_t *peer_data, dict_t *dst_dict, char *key_prefix, out: if (msg[0]) - gf_log ("glusterd", GF_LOG_ERROR, "%s", msg); - gf_log ("", GF_LOG_DEBUG, "Returning with %d", ret); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_IMPORT_PRDICT_DICT, "%s", msg); + gf_msg_debug ("", 0, "Returning with %d", ret); return ret; } @@ -2803,8 +2832,9 @@ glusterd_import_friend_volume_opts (dict_t *peer_data, int count, out: if (msg[0]) - gf_log ("glusterd", GF_LOG_ERROR, "%s", msg); - gf_log ("", GF_LOG_DEBUG, "Returning with %d", ret); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_VOL_OPTS_IMPORT_FAIL, "%s", msg); + gf_msg_debug ("", 0, "Returning with %d", ret); return ret; } @@ -2890,8 +2920,9 @@ glusterd_import_new_brick (dict_t *peer_data, int32_t vol_count, *brickinfo = new_brickinfo; out: if (msg[0]) - gf_log ("glusterd", GF_LOG_ERROR, "%s", msg); - gf_log ("", GF_LOG_DEBUG, "Returning with %d", ret); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_BRICK_IMPORT_FAIL, "%s", msg); + gf_msg_debug ("", 0, "Returning with %d", ret); return ret; } @@ -2931,7 +2962,7 @@ glusterd_import_bricks (dict_t *peer_data, int32_t vol_count, } ret = 0; out: - gf_log ("", GF_LOG_DEBUG, "Returning with %d", ret); + gf_msg_debug ("", 0, "Returning with %d", ret); return ret; } @@ -2978,14 +3009,14 @@ glusterd_import_quota_conf (dict_t *peer_data, int vol_idx, key[sizeof(key)-1] = '\0'; ret = dict_get_uint32 (peer_data, key, &new_volinfo->quota_conf_cksum); if (ret) - gf_log (this->name, GF_LOG_DEBUG, "Failed to get quota cksum"); + gf_msg_debug (this->name, 0, "Failed to get quota cksum"); snprintf (key, sizeof (key)-1, "%s%d.quota-version", prefix, vol_idx); key[sizeof(key)-1] = '\0'; ret = dict_get_uint32 (peer_data, key, &new_volinfo->quota_conf_version); if (ret) - gf_log (this->name, GF_LOG_DEBUG, "Failed to get quota " + gf_msg_debug (this->name, 0, "Failed to get quota " "version"); snprintf (key, sizeof (key)-1, "%s%d.gfid-count", prefix, vol_idx); @@ -3017,7 +3048,8 @@ glusterd_import_quota_conf (dict_t *peer_data, int vol_idx, ret = glusterd_quota_conf_write_gfid (fd, gfid, (char)gfid_type); if (ret < 0) { - gf_log (this->name, GF_LOG_CRITICAL, "Unable to write " + gf_msg (this->name, GF_LOG_CRITICAL, errno, + GD_MSG_QUOTA_CONF_WRITE_FAIL, "Unable to write " "gfid %s into quota.conf for %s", gfid_str, new_volinfo->volname); ret = -1; @@ -3033,14 +3065,16 @@ out: if (!ret) { ret = glusterd_compute_cksum (new_volinfo, _gf_true); if (ret) { - gf_log (this->name, GF_LOG_ERROR, + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_CKSUM_COMPUTE_FAIL, "Failed to compute checksum"); goto clear_quota_conf; } ret = glusterd_store_save_quota_version_and_cksum (new_volinfo); if (ret) - gf_log (this->name, GF_LOG_ERROR, + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_QUOTA_CKSUM_VER_STORE_FAIL, "Failed to save quota version and checksum"); } @@ -3088,7 +3122,7 @@ gd_import_friend_volume_rebal_dict (dict_t *dict, int count, out: if (ret && volinfo->rebal.dict) dict_unref (volinfo->rebal.dict); - gf_log (THIS->name, GF_LOG_DEBUG, "Returning with %d", ret); + gf_msg_debug (THIS->name, 0, "Returning with %d", ret); return ret; } @@ -3191,7 +3225,8 @@ glusterd_import_volinfo (dict_t *peer_data, int count, snprintf (key, sizeof (key), "%s%d.stripe_count", prefix, count); ret = dict_get_int32 (peer_data, key, &new_volinfo->stripe_count); if (ret) - gf_log (THIS->name, GF_LOG_INFO, + gf_msg (THIS->name, GF_LOG_INFO, 0, + GD_MSG_DICT_GET_FAILED, "peer is possibly old version"); /* not having a 'replica_count' key is not a error @@ -3200,7 +3235,8 @@ glusterd_import_volinfo (dict_t *peer_data, int count, snprintf (key, sizeof (key), "%s%d.replica_count", prefix, count); ret = dict_get_int32 (peer_data, key, &new_volinfo->replica_count); if (ret) - gf_log (THIS->name, GF_LOG_INFO, + gf_msg (THIS->name, GF_LOG_INFO, 0, + GD_MSG_DICT_GET_FAILED, "peer is possibly old version"); /* not having a 'disperse_count' key is not a error @@ -3209,7 +3245,8 @@ glusterd_import_volinfo (dict_t *peer_data, int count, snprintf (key, sizeof (key), "%s%d.disperse_count", prefix, count); ret = dict_get_int32 (peer_data, key, &new_volinfo->disperse_count); if (ret) - gf_log (THIS->name, GF_LOG_INFO, + gf_msg (THIS->name, GF_LOG_INFO, 0, + GD_MSG_DICT_GET_FAILED, "peer is possibly old version"); /* not having a 'redundancy_count' key is not a error @@ -3218,7 +3255,8 @@ glusterd_import_volinfo (dict_t *peer_data, int count, snprintf (key, sizeof (key), "%s%d.redundancy_count", prefix, count); ret = dict_get_int32 (peer_data, key, &new_volinfo->redundancy_count); if (ret) - gf_log (THIS->name, GF_LOG_INFO, + gf_msg (THIS->name, GF_LOG_INFO, 0, + GD_MSG_DICT_GET_FAILED, "peer is possibly old version"); /* not having a 'dist_count' key is not a error @@ -3227,7 +3265,8 @@ glusterd_import_volinfo (dict_t *peer_data, int count, snprintf (key, sizeof (key), "%s%d.dist_count", prefix, count); ret = dict_get_int32 (peer_data, key, &new_volinfo->dist_leaf_count); if (ret) - gf_log (THIS->name, GF_LOG_INFO, + gf_msg (THIS->name, GF_LOG_INFO, 0, + GD_MSG_DICT_GET_FAILED, "peer is possibly old version"); /* not having a 'hot_brick_count' key is not a error @@ -3414,7 +3453,9 @@ glusterd_import_volinfo (dict_t *peer_data, int count, ret = gd_import_volume_snap_details (peer_data, new_volinfo, key, volname); if (ret) { - gf_log ("glusterd", GF_LOG_ERROR, "Failed to import snapshot " + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_SNAP_DETAILS_IMPORT_FAIL, + "Failed to import snapshot " "details for volume %s", volname); goto out; } @@ -3449,7 +3490,8 @@ glusterd_import_volinfo (dict_t *peer_data, int count, } else if (((op_version == 0) && (client_op_version != 0)) || ((op_version != 0) && (client_op_version == 0))) { ret = -1; - gf_log ("glusterd", GF_LOG_ERROR, + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, "Only one volume op-version found"); goto out; } else { @@ -3469,8 +3511,9 @@ glusterd_import_volinfo (dict_t *peer_data, int count, *volinfo = new_volinfo; out: if (msg[0]) - gf_log ("glusterd", GF_LOG_ERROR, "%s", msg); - gf_log ("", GF_LOG_DEBUG, "Returning with %d", ret); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_VOLINFO_IMPORT_FAIL, "%s", msg); + gf_msg_debug ("", 0, "Returning with %d", ret); return ret; } @@ -3485,7 +3528,9 @@ glusterd_volume_disconnect_all_bricks (glusterd_volinfo_t *volinfo) if (glusterd_is_brick_started (brickinfo)) { ret = glusterd_brick_disconnect (brickinfo); if (ret) { - gf_log ("glusterd", GF_LOG_ERROR, "Failed to " + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSD_BRICK_DISCONNECT_FAIL, + "Failed to " "disconnect %s:%s", brickinfo->hostname, brickinfo->path); break; @@ -3575,7 +3620,7 @@ glusterd_volinfo_stop_stale_bricks (glusterd_volinfo_t *new_volinfo, } ret = 0; out: - gf_log ("", GF_LOG_DEBUG, "Returning with %d", ret); + gf_msg_debug ("", 0, "Returning with %d", ret); return ret; } @@ -3609,7 +3654,8 @@ glusterd_delete_stale_volume (glusterd_volinfo_t *stale_volinfo, valid_volinfo->restored_from_snap))) { ret = glusterd_lvm_snapshot_remove (NULL, stale_volinfo); if (ret) { - gf_log(this->name, GF_LOG_WARNING, + gf_msg(this->name, GF_LOG_WARNING, 0, + GD_MSG_SNAP_REMOVE_FAIL, "Failed to remove lvm snapshot for " "restored volume %s", stale_volinfo->volname); } @@ -3729,14 +3775,15 @@ glusterd_import_friend_volume (dict_t *peer_data, size_t count) goto out; if (!new_volinfo) { - gf_log (this->name, GF_LOG_DEBUG, + gf_msg_debug (this->name, 0, "Not importing snap volume"); goto out; } ret = glusterd_snapdsvc_init (new_volinfo); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to initialize " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_SNAPD_INIT_FAIL, "Failed to initialize " "snapdsvc for volume %s", new_volinfo->volname); goto out; } @@ -3748,7 +3795,8 @@ glusterd_import_friend_volume (dict_t *peer_data, size_t count) */ ret = glusterd_snapdsvc_init (old_volinfo); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to initialize" + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_SNAPD_INIT_FAIL, "Failed to initialize" " snapdsvc for old volume %s", old_volinfo->volname); goto out; @@ -3780,7 +3828,7 @@ glusterd_import_friend_volume (dict_t *peer_data, size_t count) glusterd_compare_volume_name); out: - gf_log ("", GF_LOG_DEBUG, "Returning with ret: %d", ret); + gf_msg_debug ("", 0, "Returning with ret: %d", ret); return ret; } @@ -3805,7 +3853,7 @@ glusterd_import_friend_volumes (dict_t *peer_data) } out: - gf_log ("", GF_LOG_DEBUG, "Returning with %d", ret); + gf_msg_debug ("", 0, "Returning with %d", ret); return ret; } @@ -3873,7 +3921,8 @@ glusterd_import_global_opts (dict_t *friend_data) ret = import_prdict_dict (friend_data, import_options, "key", "val", count, "global"); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to import" + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_GLOBAL_OPT_IMPORT_FAIL, "Failed to import" " global options"); goto out; } @@ -3919,7 +3968,8 @@ glusterd_compare_friend_data (dict_t *peer_data, int32_t *status, ret = glusterd_import_global_opts (peer_data); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Importing global " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_GLOBAL_OPT_IMPORT_FAIL, "Importing global " "options failed"); goto out; } @@ -3953,7 +4003,7 @@ glusterd_compare_friend_data (dict_t *peer_data, int32_t *status, } out: - gf_log (this->name, GF_LOG_DEBUG, + gf_msg_debug (this->name, 0, "Returning with ret: %d, status: %d", ret, *status); return ret; } @@ -4053,7 +4103,8 @@ glusterd_unlink_file (char *sockfpath) if (ENOENT == errno) ret = 0; else - gf_log (THIS->name, GF_LOG_ERROR, "Failed to remove %s" + gf_msg (THIS->name, GF_LOG_ERROR, errno, + GD_MSG_FILE_OP_FAILED, "Failed to remove %s" " error: %s", sockfpath, strerror (errno)); } @@ -4066,32 +4117,44 @@ glusterd_nfs_pmap_deregister () if (pmap_unset (MOUNT_PROGRAM, MOUNTV3_VERSION)) gf_log ("", GF_LOG_INFO, "De-registered MOUNTV3 successfully"); else - gf_log ("", GF_LOG_ERROR, "De-register MOUNTV3 is unsuccessful"); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_PMAP_UNSET_FAIL, + "De-register MOUNTV3 is unsuccessful"); if (pmap_unset (MOUNT_PROGRAM, MOUNTV1_VERSION)) gf_log ("", GF_LOG_INFO, "De-registered MOUNTV1 successfully"); else - gf_log ("", GF_LOG_ERROR, "De-register MOUNTV1 is unsuccessful"); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_PMAP_UNSET_FAIL, + "De-register MOUNTV1 is unsuccessful"); if (pmap_unset (NFS_PROGRAM, NFSV3_VERSION)) gf_log ("", GF_LOG_INFO, "De-registered NFSV3 successfully"); else - gf_log ("", GF_LOG_ERROR, "De-register NFSV3 is unsuccessful"); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_PMAP_UNSET_FAIL, + "De-register NFSV3 is unsuccessful"); if (pmap_unset (NLM_PROGRAM, NLMV4_VERSION)) gf_log ("", GF_LOG_INFO, "De-registered NLM v4 successfully"); else - gf_log ("", GF_LOG_ERROR, "De-registration of NLM v4 failed"); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_PMAP_UNSET_FAIL, + "De-registration of NLM v4 failed"); if (pmap_unset (NLM_PROGRAM, NLMV1_VERSION)) gf_log ("", GF_LOG_INFO, "De-registered NLM v1 successfully"); else - gf_log ("", GF_LOG_ERROR, "De-registration of NLM v1 failed"); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_PMAP_UNSET_FAIL, + "De-registration of NLM v1 failed"); if (pmap_unset (ACL_PROGRAM, ACLV3_VERSION)) gf_log ("", GF_LOG_INFO, "De-registered ACL v3 successfully"); else - gf_log ("", GF_LOG_ERROR, "De-registration of ACL v3 failed"); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_PMAP_UNSET_FAIL, + "De-registration of ACL v3 failed"); } int @@ -4193,7 +4256,7 @@ glusterd_add_node_to_dict (char *server, dict_t *dict, int count, out: - gf_log (THIS->name, GF_LOG_DEBUG, "Returning %d", ret); + gf_msg_debug (THIS->name, 0, "Returning %d", ret); return ret; } @@ -4312,7 +4375,7 @@ glusterd_volume_count_get (void) } - gf_log ("", GF_LOG_DEBUG, "Returning %d", ret); + gf_msg_debug ("", 0, "Returning %d", ret); return ret; } @@ -4362,7 +4425,9 @@ glusterd_brick_start (glusterd_volinfo_t *volinfo, if (gf_uuid_is_null (brickinfo->uuid)) { ret = glusterd_resolve_brick (brickinfo); if (ret) { - gf_log (this->name, GF_LOG_ERROR, FMTSTR_RESOLVE_BRICK, + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_RESOLVE_BRICK_FAIL, + FMTSTR_RESOLVE_BRICK, brickinfo->hostname, brickinfo->path); goto out; } @@ -4374,13 +4439,15 @@ glusterd_brick_start (glusterd_volinfo_t *volinfo, } ret = glusterd_volume_start_glusterfs (volinfo, brickinfo, wait); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Unable to start brick %s:%s", + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_BRICK_DISCONNECTED, + "Unable to start brick %s:%s", brickinfo->hostname, brickinfo->path); goto out; } out: - gf_log (this->name, GF_LOG_DEBUG, "returning %d ", ret); + gf_msg_debug (this->name, 0, "returning %d ", ret); return ret; } @@ -4404,7 +4471,7 @@ glusterd_restart_bricks (glusterd_conf_t *conf) start_svcs = _gf_true; glusterd_svcs_manager (volinfo); } - gf_log (this->name, GF_LOG_DEBUG, "starting the volume %s", + gf_msg_debug (this->name, 0, "starting the volume %s", volinfo->volname); cds_list_for_each_entry (brickinfo, &volinfo->bricks, brick_list) { @@ -4421,7 +4488,7 @@ glusterd_restart_bricks (glusterd_conf_t *conf) glusterd_svcs_manager (volinfo); } start_svcs = _gf_true; - gf_log (this->name, GF_LOG_DEBUG, "starting the snap " + gf_msg_debug (this->name, 0, "starting the snap " "volume %s", volinfo->volname); cds_list_for_each_entry (brickinfo, &volinfo->bricks, brick_list) { @@ -4481,7 +4548,8 @@ _local_gsyncd_start (dict_t *this, char *key, data_t *value, void *data) ret = glusterd_get_slave_info (slave, &slave_url, &slave_host, &slave_vol, &op_errstr); if (ret) { - gf_log (this1->name, GF_LOG_ERROR, + gf_msg (this1->name, GF_LOG_ERROR, 0, + GD_MSG_SLAVEINFO_FETCH_ERROR, "Unable to fetch slave details."); ret = -1; goto out; @@ -4499,10 +4567,13 @@ _local_gsyncd_start (dict_t *this, char *key, data_t *value, void *data) &is_template_in_use); if (ret) { if (!strstr(slave, "::")) - gf_log (this1->name, GF_LOG_INFO, + gf_msg (this1->name, GF_LOG_INFO, 0, + GD_MSG_SLAVE_URL_INVALID, "%s is not a valid slave url.", slave); else - gf_log (this1->name, GF_LOG_INFO, "Unable to get" + gf_msg (this1->name, GF_LOG_INFO, 0, + GD_MSG_GET_STATEFILE_NAME_FAILED, + "Unable to get" " statefile's name"); goto out; } @@ -4510,7 +4581,8 @@ _local_gsyncd_start (dict_t *this, char *key, data_t *value, void *data) /* If state-file entry is missing from the config file, * do not start gsyncd on restart */ if (is_template_in_use) { - gf_log (this1->name, GF_LOG_INFO, + gf_msg (this1->name, GF_LOG_INFO, 0, + GD_MSG_NO_STATEFILE_ENTRY, "state-file entry is missing in config file." "Not Restarting"); goto out; @@ -4521,14 +4593,16 @@ _local_gsyncd_start (dict_t *this, char *key, data_t *value, void *data) ret = gsync_status (volinfo->volname, slave, confpath, &ret_status, &is_template_in_use); if (ret == -1) { - gf_log (this1->name, GF_LOG_INFO, + gf_msg (this1->name, GF_LOG_INFO, 0, + GD_MSG_GSYNC_VALIDATION_FAIL, GEOREP" start option validation failed "); ret = 0; goto out; } if (is_template_in_use == _gf_true) { - gf_log (this1->name, GF_LOG_INFO, + gf_msg (this1->name, GF_LOG_INFO, 0, + GD_MSG_PIDFILE_NOT_FOUND, "pid-file entry is missing in config file." "Not Restarting"); ret = 0; @@ -4537,7 +4611,9 @@ _local_gsyncd_start (dict_t *this, char *key, data_t *value, void *data) ret = glusterd_gsync_read_frm_status (statefile, buf, sizeof (buf)); if (ret < 0) { - gf_log (this1->name, GF_LOG_ERROR, "Unable to read the status"); + gf_msg (this1->name, GF_LOG_ERROR, 0, + GD_MSG_STAT_FILE_READ_FAILED, + "Unable to read the status"); goto out; } @@ -4576,7 +4652,9 @@ _local_gsyncd_start (dict_t *this, char *key, data_t *value, void *data) ret = dict_set_dynstr_with_alloc (volinfo->gsync_active_slaves, key1, "running"); if (ret) { - gf_log (this1->name, GF_LOG_ERROR, "Unable to set key:%s" + gf_msg (this1->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, + "Unable to set key:%s" " value:running in the dict", key1); goto out; } @@ -4595,7 +4673,8 @@ out: slave_host, slave_vol, "Config Corrupted"); if (op_ret) { - gf_log (this1->name, GF_LOG_ERROR, + gf_msg (this1->name, GF_LOG_ERROR, 0, + GD_MSG_STATUSFILE_CREATE_FAILED, "Unable to create status file" ". Error : %s", strerror (errno)); ret = op_ret; @@ -4695,10 +4774,10 @@ glusterd_set_brick_status (glusterd_brickinfo_t *brickinfo, GF_ASSERT (brickinfo); brickinfo->status = status; if (GF_BRICK_STARTED == status) { - gf_log ("glusterd", GF_LOG_DEBUG, "Setting brick %s:%s status " + gf_msg_debug ("glusterd", 0, "Setting brick %s:%s status " "to started", brickinfo->hostname, brickinfo->path); } else { - gf_log ("glusterd", GF_LOG_DEBUG, "Setting brick %s:%s status " + gf_msg_debug ("glusterd", 0, "Setting brick %s:%s status " "to stopped", brickinfo->hostname, brickinfo->path); } } @@ -4754,7 +4833,8 @@ glusterd_get_brick_root (char *path, char **mount_point) *ptr = '\0'; if (stat (mnt_pt, &buf)) { - gf_log (THIS->name, GF_LOG_ERROR, "error in " + gf_msg (THIS->name, GF_LOG_ERROR, errno, + GD_MSG_FILE_OP_FAILED, "error in " "stat: %s", strerror (errno)); goto err; } @@ -4767,7 +4847,8 @@ glusterd_get_brick_root (char *path, char **mount_point) if (ptr == mnt_pt) { if (stat ("/", &buf)) { - gf_log (THIS->name, GF_LOG_ERROR, "error in " + gf_msg (THIS->name, GF_LOG_ERROR, errno, + GD_MSG_FILE_OP_FAILED, "error in " "stat: %s", strerror (errno)); goto err; } @@ -4879,7 +4960,9 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count) runner_add_arg (&runner, fs->fs_tool_arg); runner_add_arg (&runner, device); } else { - gf_log (THIS->name, GF_LOG_ERROR, "could not find %s to get" + gf_msg (THIS->name, GF_LOG_ERROR, 0, + GD_MSG_INODE_SIZE_GET_FAIL, + "could not find %s to get" "inode size for %s (%s): %s package missing?", fs->fs_tool_name, device, fs_name, fs->fs_tool_pkg); goto out; @@ -4887,8 +4970,9 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count) ret = runner_start (&runner); if (ret) { - gf_log (THIS->name, GF_LOG_ERROR, "failed to execute " - "\"%s\": %s", fs->fs_tool_name, strerror (errno)); + gf_msg (THIS->name, GF_LOG_ERROR, errno, + GD_MSG_CMD_EXEC_FAIL, "failed to execute " + "\"%s\"", fs->fs_tool_name); /* * Runner_start might return an error after the child has * been forked, e.g. if the program isn't there. In that @@ -4917,7 +5001,8 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count) ret = runner_end (&runner); if (ret) { - gf_log (THIS->name, GF_LOG_ERROR, + gf_msg (THIS->name, GF_LOG_ERROR, errno, + GD_MSG_CMD_EXEC_FAIL, "%s exited with non-zero exit status", fs->fs_tool_name); @@ -4925,7 +5010,8 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count) } if (!cur_word) { ret = -1; - gf_log (THIS->name, GF_LOG_ERROR, + gf_msg (THIS->name, GF_LOG_ERROR, 0, + GD_MSG_INODE_SIZE_GET_FAIL, "Unable to retrieve inode size using %s", fs->fs_tool_name); goto out; @@ -4933,7 +5019,7 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count) if (dict_set_dynstr_with_alloc (cached_fs, device, cur_word)) { /* not fatal if not entered into the cache */ - gf_log (THIS->name, GF_LOG_DEBUG, + gf_msg_debug (THIS->name, 0, "failed to cache fs inode size for %s", device); } @@ -4945,7 +5031,8 @@ cached: out: if (ret) - gf_log (THIS->name, GF_LOG_ERROR, "failed to get inode size"); + gf_msg (THIS->name, GF_LOG_ERROR, 0, + GD_MSG_INODE_SIZE_GET_FAIL, "failed to get inode size"); return ret; } @@ -5053,7 +5140,9 @@ glusterd_get_brick_mount_device (char *brick_path) ret = glusterd_get_brick_root (brick_path, &mnt_pt); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to get mount point " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_BRICKPATH_ROOT_GET_FAIL, + "Failed to get mount point " "for %s brick", brick_path); goto out; } @@ -5061,7 +5150,9 @@ glusterd_get_brick_mount_device (char *brick_path) entry = glusterd_get_mnt_entry_info (mnt_pt, buff, sizeof (buff), &save_entry); if (NULL == entry) { - gf_log (this->name, GF_LOG_ERROR, "Failed to get mnt entry " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_MNTENTRY_GET_FAIL, + "Failed to get mnt entry " "for %s mount path", mnt_pt); goto out; } @@ -5098,7 +5189,8 @@ glusterd_add_brick_detail_to_dict (glusterd_volinfo_t *volinfo, ret = statvfs (brickinfo->path, &brickstat); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "statfs error: %s ", + gf_msg (this->name, GF_LOG_ERROR, errno, + GD_MSG_FILE_OP_FAILED, "statfs error: %s ", strerror (errno)); goto out; } @@ -5153,7 +5245,7 @@ glusterd_add_brick_detail_to_dict (glusterd_volinfo_t *volinfo, ret = glusterd_add_inode_size_to_dict (dict, count); out: if (ret) - gf_log (this->name, GF_LOG_DEBUG, "Error adding brick" + gf_msg_debug (this->name, 0, "Error adding brick" " detail to dict: %s", strerror (errno)); return ret; } @@ -5242,7 +5334,7 @@ glusterd_add_brick_to_dict (glusterd_volinfo_t *volinfo, out: if (ret) - gf_log (this->name, GF_LOG_DEBUG, "Returning %d", ret); + gf_msg_debug (this->name, 0, "Returning %d", ret); return ret; } @@ -5273,7 +5365,8 @@ glusterd_get_all_volnames (dict_t *dict) out: if (ret) - gf_log (THIS->name, GF_LOG_ERROR, "failed to get all " + gf_msg (THIS->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, "failed to get all " "volume names for status"); return ret; } @@ -5303,7 +5396,7 @@ glusterd_all_volume_cond_check (glusterd_condition_func func, int status, } ret = 0; out: - gf_log ("", GF_LOG_DEBUG, "returning %d", ret); + gf_msg_debug ("", 0, "returning %d", ret); return ret; } @@ -5328,7 +5421,8 @@ glusterd_brick_stop (glusterd_volinfo_t *volinfo, if (gf_uuid_is_null (brickinfo->uuid)) { ret = glusterd_resolve_brick (brickinfo); if (ret) { - gf_log (this->name, GF_LOG_ERROR, FMTSTR_RESOLVE_BRICK, + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_RESOLVE_BRICK_FAIL, FMTSTR_RESOLVE_BRICK, brickinfo->hostname, brickinfo->path); goto out; } @@ -5341,19 +5435,20 @@ glusterd_brick_stop (glusterd_volinfo_t *volinfo, goto out; } - gf_log (this->name, GF_LOG_DEBUG, "About to stop glusterfs" + gf_msg_debug (this->name, 0, "About to stop glusterfs" " for brick %s:%s", brickinfo->hostname, brickinfo->path); ret = glusterd_volume_stop_glusterfs (volinfo, brickinfo, del_brick); if (ret) { - gf_log (this->name, GF_LOG_CRITICAL, "Unable to stop" + gf_msg (this->name, GF_LOG_CRITICAL, 0, + GD_MSG_BRICK_STOP_FAIL, "Unable to stop" " brick: %s:%s", brickinfo->hostname, brickinfo->path); goto out; } out: - gf_log (this->name, GF_LOG_DEBUG, "returning %d ", ret); + gf_msg_debug (this->name, 0, "returning %d ", ret); return ret; } @@ -5444,8 +5539,9 @@ out: if (is_allocated) glusterd_brickinfo_delete (newbrickinfo); if (op_errstr[0] != '\0') - gf_log (this->name, GF_LOG_ERROR, "%s", op_errstr); - gf_log (this->name, GF_LOG_DEBUG, "returning %d ", ret); + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_BRICK_VALIDATE_FAIL, "%s", op_errstr); + gf_msg_debug (this->name, 0, "returning %d ", ret); return ret; } @@ -5464,13 +5560,17 @@ glusterd_rb_check_bricks (glusterd_volinfo_t *volinfo, if (strcmp (rb->src_brick->hostname, src->hostname) || strcmp (rb->src_brick->path, src->path)) { - gf_log("", GF_LOG_ERROR, "Replace brick src bricks differ"); + gf_msg("", GF_LOG_ERROR, 0, + GD_MSG_RB_SRC_BRICKS_MISMATCH, + "Replace brick src bricks differ"); return -1; } if (strcmp (rb->dst_brick->hostname, dst->hostname) || strcmp (rb->dst_brick->path, dst->path)) { - gf_log ("", GF_LOG_ERROR, "Replace brick dst bricks differ"); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_RB_DST_BRICKS_MISMATCH, + "Replace brick dst bricks differ"); return -1; } @@ -5582,7 +5682,8 @@ out: } if (strlen (msg)) { - gf_log (THIS->name, GF_LOG_ERROR, "%s", msg); + gf_msg (THIS->name, GF_LOG_ERROR, errno, + GD_MSG_PATH_ALREADY_PART_OF_VOL, "%s", msg); *op_errstr = gf_strdup (msg); } @@ -5686,7 +5787,7 @@ glusterd_sm_tr_log_transition_add_to_dict (dict_t *dict, goto out; out: - gf_log ("", GF_LOG_DEBUG, "returning %d", ret); + gf_msg_debug ("", 0, "returning %d", ret); return ret; } @@ -5727,7 +5828,7 @@ glusterd_sm_tr_log_add_to_dict (dict_t *dict, ret = dict_set_int32 (dict, key, log->count); out: - gf_log ("", GF_LOG_DEBUG, "returning %d", ret); + gf_msg_debug ("", 0, "returning %d", ret); return ret; } @@ -5758,7 +5859,7 @@ glusterd_sm_tr_log_init (glusterd_sm_tr_log_t *log, ret = 0; out: - gf_log ("", GF_LOG_DEBUG, "returning %d", ret); + gf_msg_debug ("", 0, "returning %d", ret); return ret; } @@ -5805,11 +5906,11 @@ glusterd_sm_tr_log_transition_add (glusterd_sm_tr_log_t *log, if (log->count < log->size) log->count++; ret = 0; - gf_log (this->name, GF_LOG_DEBUG, "Transitioning from '%s' to '%s' " + gf_msg_debug (this->name, 0, "Transitioning from '%s' to '%s' " "due to event '%s'", log->state_name_get (old_state), log->state_name_get (new_state), log->event_name_get (event)); out: - gf_log (this->name, GF_LOG_DEBUG, "returning %d", ret); + gf_msg_debug (this->name, 0, "returning %d", ret); return ret; } @@ -5829,7 +5930,7 @@ glusterd_remove_pending_entry (struct cds_list_head *list, void *elem) } } out: - gf_log (THIS->name, GF_LOG_DEBUG, "returning %d", ret); + gf_msg_debug (THIS->name, 0, "returning %d", ret); return ret; } @@ -5861,7 +5962,7 @@ glusterd_delete_volume (glusterd_volinfo_t *volinfo) glusterd_volinfo_remove (volinfo); out: - gf_log (THIS->name, GF_LOG_DEBUG, "returning %d", ret); + gf_msg_debug (THIS->name, 0, "returning %d", ret); return ret; } @@ -5919,7 +6020,7 @@ glusterd_get_local_brickpaths (glusterd_volinfo_t *volinfo, char **pathlist) path_tokens = GF_CALLOC (sizeof(char*), volinfo->brick_count, gf_gld_mt_charptr); if (!path_tokens) { - gf_log ("", GF_LOG_DEBUG, "Could not allocate memory."); + gf_msg_debug ("", 0, "Could not allocate memory."); ret = -1; goto out; } @@ -5936,7 +6037,7 @@ glusterd_get_local_brickpaths (glusterd_volinfo_t *volinfo, char **pathlist) path[sizeof(path)-1] = '\0'; path_tokens[count] = gf_strdup (path); if (!path_tokens[count]) { - gf_log ("", GF_LOG_DEBUG, + gf_msg_debug ("", 0, "Could not allocate memory."); ret = -1; goto out; @@ -5948,7 +6049,7 @@ glusterd_get_local_brickpaths (glusterd_volinfo_t *volinfo, char **pathlist) tmp_path_list = GF_CALLOC (sizeof(char), total_len + 1, gf_gld_mt_char); if (!tmp_path_list) { - gf_log ("", GF_LOG_DEBUG, "Could not allocate memory."); + gf_msg_debug ("", 0, "Could not allocate memory."); ret = -1; goto out; } @@ -5971,12 +6072,12 @@ out: path_tokens = NULL; if (ret == 0) { - gf_log ("", GF_LOG_DEBUG, "No Local Bricks Present."); + gf_msg_debug ("", 0, "No Local Bricks Present."); GF_FREE (tmp_path_list); tmp_path_list = NULL; } - gf_log ("", GF_LOG_DEBUG, "Returning %d", ret); + gf_msg_debug ("", 0, "Returning %d", ret); return ret; } @@ -6004,7 +6105,7 @@ glusterd_start_gsync (glusterd_volinfo_t *master_vol, char *slave, if (!path_list) { ret = 0; - gf_log ("", GF_LOG_DEBUG, "No Bricks in this node." + gf_msg_debug ("", 0, "No Bricks in this node." " Not starting gsyncd."); goto out; } @@ -6067,7 +6168,7 @@ out: "the " GEOREP " session"); } - gf_log ("", GF_LOG_DEBUG, "Returning %d", ret); + gf_msg_debug ("", 0, "Returning %d", ret); return ret; } @@ -6084,21 +6185,24 @@ glusterd_recreate_volfiles (glusterd_conf_t *conf) cds_list_for_each_entry (volinfo, &conf->volumes, vol_list) { ret = generate_brick_volfiles (volinfo); if (ret) { - gf_log ("glusterd", GF_LOG_ERROR, "Failed to " + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_VOLFILE_CREATE_FAIL, "Failed to " "regenerate brick volfiles for %s", volinfo->volname); op_ret = ret; } ret = generate_client_volfiles (volinfo, GF_CLIENT_TRUSTED); if (ret) { - gf_log ("glusterd", GF_LOG_ERROR, "Failed to " + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_VOLFILE_CREATE_FAIL, "Failed to " "regenerate trusted client volfiles for %s", volinfo->volname); op_ret = ret; } ret = generate_client_volfiles (volinfo, GF_CLIENT_OTHER); if (ret) { - gf_log ("glusterd", GF_LOG_ERROR, "Failed to " + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_VOLFILE_CREATE_FAIL, "Failed to " "regenerate client volfiles for %s", volinfo->volname); op_ret = ret; @@ -6121,7 +6225,8 @@ glusterd_handle_upgrade_downgrade (dict_t *options, glusterd_conf_t *conf) if (!ret) { ret = gf_string2boolean (type, &upgrade); if (ret) { - gf_log ("glusterd", GF_LOG_ERROR, "upgrade option " + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_STR_TO_BOOL_FAIL, "upgrade option " "%s is not a valid boolean type", type); ret = -1; goto out; @@ -6134,7 +6239,8 @@ glusterd_handle_upgrade_downgrade (dict_t *options, glusterd_conf_t *conf) if (!ret) { ret = gf_string2boolean (type, &downgrade); if (ret) { - gf_log ("glusterd", GF_LOG_ERROR, "downgrade option " + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_STR_TO_BOOL_FAIL, "downgrade option " "%s is not a valid boolean type", type); ret = -1; goto out; @@ -6142,7 +6248,8 @@ glusterd_handle_upgrade_downgrade (dict_t *options, glusterd_conf_t *conf) } if (upgrade && downgrade) { - gf_log ("glusterd", GF_LOG_ERROR, "Both upgrade and downgrade" + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_WRONG_OPTS_SETTING, "Both upgrade and downgrade" " options are set. Only one should be on"); ret = -1; goto out; @@ -6261,7 +6368,8 @@ glusterd_brick_statedump (glusterd_volinfo_t *volinfo, if (gf_uuid_is_null (brickinfo->uuid)) { ret = glusterd_resolve_brick (brickinfo); if (ret) { - gf_log ("glusterd", GF_LOG_ERROR, + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_RESOLVE_BRICK_FAIL, "Cannot resolve brick %s:%s", brickinfo->hostname, brickinfo->path); goto out; @@ -6277,7 +6385,8 @@ glusterd_brick_statedump (glusterd_volinfo_t *volinfo, pidfile = fopen (pidfile_path, "r"); if (!pidfile) { - gf_log ("", GF_LOG_ERROR, "Unable to open pidfile: %s", + gf_msg ("glusterd", GF_LOG_ERROR, errno, + GD_MSG_FILE_OP_FAILED, "Unable to open pidfile: %s", pidfile_path); ret = -1; goto out; @@ -6285,7 +6394,9 @@ glusterd_brick_statedump (glusterd_volinfo_t *volinfo, ret = fscanf (pidfile, "%d", &pid); if (ret <= 0) { - gf_log ("", GF_LOG_ERROR, "Unable to get pid of brick process"); + gf_msg ("glusterd", GF_LOG_ERROR, errno, + GD_MSG_FILE_OP_FAILED, + "Unable to get pid of brick process"); ret = -1; goto out; } @@ -6294,7 +6405,9 @@ glusterd_brick_statedump (glusterd_volinfo_t *volinfo, DEFAULT_VAR_RUN_DIRECTORY"/glusterdump.%d.options", pid); ret = glusterd_set_dump_options (dumpoptions_path, options, option_cnt); if (ret < 0) { - gf_log ("", GF_LOG_ERROR, "error while parsing the statedump " + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_BRK_STATEDUMP_FAIL, + "error while parsing the statedump " "options"); ret = -1; goto out; @@ -6350,7 +6463,8 @@ glusterd_nfs_statedump (char *options, int option_cnt, char **op_errstr) pidfile = fopen (pidfile_path, "r"); if (!pidfile) { - gf_log ("", GF_LOG_ERROR, "Unable to open pidfile: %s", + gf_msg ("glusterd", GF_LOG_ERROR, errno, + GD_MSG_FILE_OP_FAILED, "Unable to open pidfile: %s", pidfile_path); ret = -1; goto out; @@ -6358,7 +6472,9 @@ glusterd_nfs_statedump (char *options, int option_cnt, char **op_errstr) ret = fscanf (pidfile, "%d", &pid); if (ret <= 0) { - gf_log ("", GF_LOG_ERROR, "Unable to get pid of brick process"); + gf_msg ("glusterd", GF_LOG_ERROR, errno, + GD_MSG_FILE_OP_FAILED, + "Unable to get pid of brick process"); ret = -1; goto out; } @@ -6367,7 +6483,9 @@ glusterd_nfs_statedump (char *options, int option_cnt, char **op_errstr) DEFAULT_VAR_RUN_DIRECTORY"/glusterdump.%d.options", pid); ret = glusterd_set_dump_options (dumpoptions_path, options, option_cnt); if (ret < 0) { - gf_log ("", GF_LOG_ERROR, "error while parsing the statedump " + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_BRK_STATEDUMP_FAIL, + "error while parsing the statedump " "options"); ret = -1; goto out; @@ -6425,7 +6543,8 @@ glusterd_quotad_statedump (char *options, int option_cnt, char **op_errstr) pidfile = fopen (pidfile_path, "r"); if (!pidfile) { - gf_log (this->name, GF_LOG_ERROR, "Unable to open pidfile: %s", + gf_msg (this->name, GF_LOG_ERROR, errno, + GD_MSG_FILE_OP_FAILED, "Unable to open pidfile: %s", pidfile_path); ret = -1; goto out; @@ -6433,7 +6552,8 @@ glusterd_quotad_statedump (char *options, int option_cnt, char **op_errstr) ret = fscanf (pidfile, "%d", &pid); if (ret <= 0) { - gf_log (this->name, GF_LOG_ERROR, "Unable to get pid of quotad " + gf_msg (this->name, GF_LOG_ERROR, errno, + GD_MSG_FILE_OP_FAILED, "Unable to get pid of quotad " "process"); ret = -1; goto out; @@ -6443,7 +6563,8 @@ glusterd_quotad_statedump (char *options, int option_cnt, char **op_errstr) DEFAULT_VAR_RUN_DIRECTORY"/glusterdump.%d.options", pid); ret = glusterd_set_dump_options (dumpoptions_path, options, option_cnt); if (ret < 0) { - gf_log (this->name, GF_LOG_ERROR, "error while parsing " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_BRK_STATEDUMP_FAIL, "error while parsing " "statedump options"); ret = -1; goto out; @@ -6493,7 +6614,7 @@ glusterd_friend_contains_vol_bricks (glusterd_volinfo_t *volinfo, else ret = 1; } - gf_log (THIS->name, GF_LOG_DEBUG, "Returning %d", ret); + gf_msg_debug (THIS->name, 0, "Returning %d", ret); return ret; } @@ -6519,7 +6640,8 @@ glusterd_friend_remove_cleanup_vols (uuid_t uuid) "Deleting stale volume %s", volinfo->volname); ret = glusterd_delete_volume (volinfo); if (ret) { - gf_log (THIS->name, GF_LOG_ERROR, + gf_msg (THIS->name, GF_LOG_ERROR, 0, + GD_MSG_STALE_VOL_REMOVE_FAIL, "Error deleting stale volume"); goto out; } @@ -6527,7 +6649,7 @@ glusterd_friend_remove_cleanup_vols (uuid_t uuid) } ret = 0; out: - gf_log (THIS->name, GF_LOG_DEBUG, "Returning %d", ret); + gf_msg_debug (THIS->name, 0, "Returning %d", ret); return ret; } @@ -6647,7 +6769,9 @@ glusterd_volume_defrag_restart (glusterd_volinfo_t *volinfo, char *op_errstr, cbk, volinfo->rebal.op); break; default: - gf_log (this->name, GF_LOG_ERROR, "Unknown defrag status (%d)." + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_REBALANCE_START_FAIL, + "Unknown defrag status (%d)." "Not starting rebalance process for %s.", volinfo->rebal.defrag_status, volinfo->volname); break; @@ -6721,19 +6845,24 @@ glusterd_validate_volume_id (dict_t *op_dict, glusterd_volinfo_t *volinfo) ret = dict_get_str (op_dict, "vol-id", &volid_str); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to get volume id for " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "Failed to get volume id for " "volume %s", volinfo->volname); goto out; } ret = gf_uuid_parse (volid_str, vol_uid); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to parse volume id " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_UUID_PARSE_FAIL, + "Failed to parse volume id " "for volume %s", volinfo->volname); goto out; } if (gf_uuid_compare (vol_uid, volinfo->volume_id)) { - gf_log (this->name, GF_LOG_ERROR, "Volume ids of volume %s - %s" + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_VOL_ID_MISMATCH, "Volume ids of volume %s - %s" " and %s - are different. Possibly a split brain among " "peers.", volinfo->volname, volid_str, uuid_utoa (volinfo->volume_id)); @@ -6765,32 +6894,32 @@ glusterd_defrag_volume_status_update (glusterd_volinfo_t *volinfo, ret = dict_get_uint64 (rsp_dict, "files", &files); if (ret) - gf_log (this->name, GF_LOG_TRACE, + gf_msg_trace (this->name, 0, "failed to get file count"); ret = dict_get_uint64 (rsp_dict, "size", &size); if (ret) - gf_log (this->name, GF_LOG_TRACE, + gf_msg_trace (this->name, 0, "failed to get size of xfer"); ret = dict_get_uint64 (rsp_dict, "lookups", &lookup); if (ret) - gf_log (this->name, GF_LOG_TRACE, + gf_msg_trace (this->name, 0, "failed to get lookedup file count"); ret = dict_get_int32 (rsp_dict, "status", (int32_t *)&status); if (ret) - gf_log (this->name, GF_LOG_TRACE, + gf_msg_trace (this->name, 0, "failed to get status"); ret = dict_get_uint64 (rsp_dict, "failures", &failures); if (ret) - gf_log (this->name, GF_LOG_TRACE, + gf_msg_trace (this->name, 0, "failed to get failure count"); ret = dict_get_uint64 (rsp_dict, "skipped", &skipped); if (ret) - gf_log (this->name, GF_LOG_TRACE, + gf_msg_trace (this->name, 0, "failed to get skipped count"); ret = dict_get_uint64 (rsp_dict, "promoted", &promoted); @@ -6805,7 +6934,7 @@ glusterd_defrag_volume_status_update (glusterd_volinfo_t *volinfo, ret = dict_get_double (rsp_dict, "run-time", &run_time); if (ret) - gf_log (this->name, GF_LOG_TRACE, + gf_msg_trace (this->name, 0, "failed to get run-time"); if (files) @@ -6854,7 +6983,9 @@ glusterd_check_topology_identical (const char *filename1, /* fopen() the volfile1 to create the graph */ fp1 = fopen (filename1, "r"); if (fp1 == NULL) { - gf_log (this->name, GF_LOG_ERROR, "fopen() on file: %s failed " + gf_msg (this->name, GF_LOG_ERROR, errno, + GD_MSG_FILE_OP_FAILED, + "fopen() on file: %s failed " "(%s)", filename1, strerror (errno)); goto out; } @@ -6862,7 +6993,9 @@ glusterd_check_topology_identical (const char *filename1, /* fopen() the volfile2 to create the graph */ fp2 = fopen (filename2, "r"); if (fp2 == NULL) { - gf_log (this->name, GF_LOG_ERROR, "fopen() on file: %s failed " + gf_msg (this->name, GF_LOG_ERROR, errno, + GD_MSG_FILE_OP_FAILED, + "fopen() on file: %s failed " "(%s)", filename2, strerror (errno)); goto out; } @@ -6890,7 +7023,7 @@ out: if (grph2) glusterfs_graph_destroy(grph2); - gf_log (this->name, GF_LOG_DEBUG, "Returning with %d", ret); + gf_msg_debug (this->name, 0, "Returning with %d", ret); return ret; } @@ -6914,7 +7047,9 @@ glusterd_check_files_identical (char *filename1, char *filename2, ret = stat (filename1, &buf1); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "stat on file: %s failed " + gf_msg (this->name, GF_LOG_ERROR, errno, + GD_MSG_FILE_OP_FAILED, + "stat on file: %s failed " "(%s)", filename1, strerror (errno)); goto out; } @@ -6922,7 +7057,9 @@ glusterd_check_files_identical (char *filename1, char *filename2, ret = stat (filename2, &buf2); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "stat on file: %s failed " + gf_msg (this->name, GF_LOG_ERROR, errno, + GD_MSG_FILE_OP_FAILED, + "stat on file: %s failed " "(%s)", filename2, strerror (errno)); goto out; } @@ -6947,7 +7084,7 @@ glusterd_check_files_identical (char *filename1, char *filename2, *identical = _gf_true; out: - gf_log (this->name, GF_LOG_DEBUG, "Returning with %d", ret); + gf_msg_debug (this->name, 0, "Returning with %d", ret); return ret; } @@ -6975,7 +7112,8 @@ glusterd_volset_help (dict_t *dict, char **op_errstr) #if (HAVE_LIB_XML) ret = 0; #else - gf_log (this->name, GF_LOG_ERROR, + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_MODULE_NOT_INSTALLED, "libxml not present in the system"); if (op_errstr) *op_errstr = gf_strdup ("Error: xml libraries not " @@ -6993,7 +7131,7 @@ glusterd_volset_help (dict_t *dict, char **op_errstr) *op_errstr = gf_strdup ("Failed to get volume options help"); out: - gf_log ("glusterd", GF_LOG_DEBUG, "Returning %d", ret); + gf_msg_debug ("glusterd", 0, "Returning %d", ret); return ret; } @@ -7018,7 +7156,9 @@ glusterd_to_cli (rpcsvc_request_t *req, gf_cli_rsp *arg, struct iovec *payload, ret = dict_get_str (dict, "cmd-str", &cmd); if (ret) - gf_log (this->name, GF_LOG_ERROR, "Failed to get command " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "Failed to get command " "string"); if (cmd) { @@ -7052,14 +7192,16 @@ glusterd_append_gsync_status (dict_t *dst, dict_t *src) ret = dict_set_dynstr_with_alloc (dst, "gsync-status", stop_msg); if (ret) { - gf_log ("glusterd", GF_LOG_WARNING, "Unable to set the stop" + gf_msg ("glusterd", GF_LOG_WARNING, 0, + GD_MSG_DICT_SET_FAILED, + "Unable to set the stop" "message in the ctx dictionary"); goto out; } ret = 0; out: - gf_log ("glusterd", GF_LOG_DEBUG, "Returning %d", ret); + gf_msg_debug ("glusterd", 0, "Returning %d", ret); return ret; } @@ -7086,7 +7228,7 @@ glusterd_append_status_dicts (dict_t *dst, dict_t *src) ret = dict_get_int32 (src, "gsync-count", &src_count); if (ret || !src_count) { - gf_log ("", GF_LOG_DEBUG, "Source brick empty"); + gf_msg_debug ("", 0, "Source brick empty"); ret = 0; goto out; } @@ -7102,7 +7244,8 @@ glusterd_append_status_dicts (dict_t *dst, dict_t *src) dst_sts_val = GF_CALLOC (1, sizeof(gf_gsync_status_t), gf_common_mt_gsync_status_t); if (!dst_sts_val) { - gf_log ("", GF_LOG_ERROR, "Out Of Memory"); + gf_msg ("glusterd", GF_LOG_ERROR, ENOMEM, + GD_MSG_NO_MEMORY, "Out Of Memory"); goto out; } @@ -7119,7 +7262,7 @@ glusterd_append_status_dicts (dict_t *dst, dict_t *src) ret = dict_set_int32 (dst, "gsync-count", dst_count+src_count); out: - gf_log ("", GF_LOG_DEBUG, "Returning %d", ret); + gf_msg_debug ("", 0, "Returning %d", ret); return ret; } @@ -7141,7 +7284,7 @@ glusterd_aggr_brick_mount_dirs (dict_t *aggr, dict_t *rsp_dict) ret = dict_get_int32 (rsp_dict, "brick_count", &brick_count); if (ret) { - gf_log (this->name, GF_LOG_DEBUG, "No brick_count present"); + gf_msg_debug (this->name, 0, "No brick_count present"); ret = 0; goto out; } @@ -7152,7 +7295,7 @@ glusterd_aggr_brick_mount_dirs (dict_t *aggr, dict_t *rsp_dict) ret = dict_get_str (rsp_dict, key, &brick_mount_dir); if (ret) { /* Coz the info will come from a different node */ - gf_log (this->name, GF_LOG_DEBUG, + gf_msg_debug (this->name, 0, "%s not present", key); continue; } @@ -7160,7 +7303,8 @@ glusterd_aggr_brick_mount_dirs (dict_t *aggr, dict_t *rsp_dict) ret = dict_set_dynstr_with_alloc (aggr, key, brick_mount_dir); 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 %s", key); goto out; } @@ -7168,7 +7312,7 @@ glusterd_aggr_brick_mount_dirs (dict_t *aggr, dict_t *rsp_dict) ret = 0; out: - gf_log (this->name, GF_LOG_TRACE, "Returning %d ", ret); + gf_msg_trace (this->name, 0, "Returning %d ", ret); return ret; } @@ -7185,7 +7329,8 @@ glusterd_gsync_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict, char *op_errstr) } else { ctx = glusterd_op_get_ctx (); if (!ctx) { - gf_log ("", GF_LOG_ERROR, + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_OPCTX_GET_FAIL, "Operation Context is not present"); GF_ASSERT (0); } @@ -7205,7 +7350,8 @@ glusterd_gsync_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict, char *op_errstr) ret = dict_set_dynstr_with_alloc (ctx, "conf_path", conf_path); if (ret) { - gf_log ("", GF_LOG_ERROR, + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, "Unable to store conf path."); goto out; } @@ -7220,7 +7366,7 @@ glusterd_gsync_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict, char *op_errstr) ret = 0; out: - gf_log ("", GF_LOG_DEBUG, "Returning %d ", ret); + gf_msg_debug ("", 0, "Returning %d ", ret); return ret; } @@ -7242,7 +7388,8 @@ glusterd_rb_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) } else { ctx = glusterd_op_get_ctx (); if (!ctx) { - gf_log ("", GF_LOG_ERROR, + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_OPCTX_GET_FAIL, "Operation Context is not present"); GF_ASSERT (0); } @@ -7251,19 +7398,21 @@ glusterd_rb_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) if (rsp_dict) { ret = dict_get_int32 (rsp_dict, "src-brick-port", &src_port); if (ret == 0) { - gf_log ("", GF_LOG_DEBUG, + gf_msg_debug ("", 0, "src-brick-port=%d found", src_port); } ret = dict_get_int32 (rsp_dict, "dst-brick-port", &dst_port); if (ret == 0) { - gf_log ("", GF_LOG_DEBUG, + gf_msg_debug ("", 0, "dst-brick-port=%d found", dst_port); } ret = glusterd_aggr_brick_mount_dirs (ctx, rsp_dict); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_BRICK_MOUNDIRS_AGGR_FAIL, + "Failed to " "aggregate brick mount dirs"); goto out; } @@ -7273,7 +7422,7 @@ glusterd_rb_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) ret = dict_set_int32 (ctx, "src-brick-port", src_port); if (ret) { - gf_log ("", GF_LOG_DEBUG, + gf_msg_debug ("", 0, "Could not set src-brick"); goto out; } @@ -7283,7 +7432,7 @@ glusterd_rb_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) ret = dict_set_int32 (ctx, "dst-brick-port", dst_port); if (ret) { - gf_log ("", GF_LOG_DEBUG, + gf_msg_debug ("", 0, "Could not set dst-brick"); goto out; } @@ -7407,7 +7556,9 @@ glusterd_volume_status_add_peer_rsp (dict_t *this, char *key, data_t *value, ret = dict_set (rsp_ctx->dict, new_key, new_value); if (ret) - gf_log ("", GF_LOG_ERROR, "Unable to set key: %s in dict", + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, + "Unable to set key: %s in dict", key); return 0; @@ -7460,7 +7611,8 @@ glusterd_volume_status_aggregate_tasks_status (dict_t *ctx_dict, ret = dict_get_int32 (rsp_dict, "tasks", &remote_count); if (ret) { - gf_log (this->name, GF_LOG_ERROR, + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, "Failed to get remote task count"); goto out; } @@ -7473,13 +7625,16 @@ glusterd_volume_status_aggregate_tasks_status (dict_t *ctx_dict, glusterd_volume_status_copy_tasks_to_ctx_dict, ctx_dict); if (ret) - gf_log (this->name, GF_LOG_ERROR, "Failed to copy tasks" + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, "Failed to copy tasks" "to ctx_dict."); goto out; } if (local_count != remote_count) { - gf_log (this->name, GF_LOG_ERROR, "Local tasks count (%d) and " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_TASKS_COUNT_MISMATCH, + "Local tasks count (%d) and " "remote tasks count (%d) do not match. Not aggregating " "tasks status.", local_count, remote_count); ret = -1; @@ -7496,7 +7651,8 @@ glusterd_volume_status_aggregate_tasks_status (dict_t *ctx_dict, snprintf (key, sizeof (key), "task%d.type", i); ret = dict_get_str (rsp_dict, key, &task_type); if (ret) { - gf_log (this->name, GF_LOG_ERROR, + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, "Failed to get task typpe from rsp dict"); goto out; } @@ -7514,14 +7670,16 @@ glusterd_volume_status_aggregate_tasks_status (dict_t *ctx_dict, snprintf (key, sizeof (key), "task%d.status", i); ret = dict_get_int32 (rsp_dict, key, &remote_status); if (ret) { - gf_log (this->name, GF_LOG_ERROR, + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, "Failed to get task status from rsp dict"); goto out; } snprintf (key, sizeof (key), "task%d.id", i); ret = dict_get_str (rsp_dict, key, &remote_task_id); if (ret) { - gf_log (this->name, GF_LOG_ERROR, + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, "Failed to get task id from rsp dict"); goto out; } @@ -7530,7 +7688,8 @@ glusterd_volume_status_aggregate_tasks_status (dict_t *ctx_dict, snprintf (key, sizeof (key), "task%d.id", j); ret = dict_get_str (ctx_dict, key, &local_task_id); if (ret) { - gf_log (this->name, GF_LOG_ERROR, + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, "Failed to get local task-id"); goto out; } @@ -7539,7 +7698,8 @@ glusterd_volume_status_aggregate_tasks_status (dict_t *ctx_dict, strlen (remote_task_id))) { /* Quit if a matching local task is not found */ if (j == (local_count - 1)) { - gf_log (this->name, GF_LOG_ERROR, + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_TASKS_COUNT_MISMATCH, "Could not find matching local " "task for task %s", remote_task_id); @@ -7552,7 +7712,8 @@ glusterd_volume_status_aggregate_tasks_status (dict_t *ctx_dict, snprintf (key, sizeof (key), "task%d.status", j); ret = dict_get_int32 (ctx_dict, key, &local_status); if (ret) { - gf_log (this->name, GF_LOG_ERROR, + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, "Failed to get local task status"); goto out; } @@ -7581,7 +7742,9 @@ glusterd_volume_status_aggregate_tasks_status (dict_t *ctx_dict, ret = dict_set_int32 (ctx_dict, key, remote_status); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_TASK_STATUS_UPDATE_FAIL, + "Failed to " "update task status"); goto out; } @@ -7667,7 +7830,8 @@ glusterd_volume_status_copy_to_op_ctx_dict (dict_t *aggr, dict_t *rsp_dict) ret = dict_get_int32 (rsp_dict, "other-count", &rsp_other_count); if (ret) { - gf_log (THIS->name, GF_LOG_ERROR, + gf_msg (THIS->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, "Failed to get other count from rsp_dict"); goto out; } @@ -7695,7 +7859,8 @@ glusterd_volume_status_copy_to_op_ctx_dict (dict_t *aggr, dict_t *rsp_dict) ret = dict_set_int32 (ctx_dict, "count", node_count + rsp_node_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 update node count"); goto out; } @@ -7703,7 +7868,8 @@ glusterd_volume_status_copy_to_op_ctx_dict (dict_t *aggr, dict_t *rsp_dict) ret = dict_set_int32 (ctx_dict, "other-count", (other_count + rsp_other_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 update other-count"); goto out; } @@ -7791,7 +7957,9 @@ glusterd_volume_rebalance_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) ret = dict_get_str (ctx_dict, "volname", &volname); if (ret) { - gf_log ("", GF_LOG_ERROR, "Unable to get volume name"); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "Unable to get volume name"); goto out; } @@ -7802,7 +7970,9 @@ glusterd_volume_rebalance_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) ret = dict_get_int32 (rsp_dict, "count", &index); if (ret) - gf_log ("", GF_LOG_ERROR, "failed to get index"); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "failed to get index"); memset (key, 0, 256); snprintf (key, 256, "node-uuid-%d", index); @@ -7825,9 +7995,11 @@ glusterd_volume_rebalance_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) /* Setting the largest index value as the total count. */ ret = dict_get_int32 (ctx_dict, "count", &count); if (count < current_index) { - ret = dict_set_int32 (ctx_dict, "count", current_index); - if (ret) - gf_log ("", GF_LOG_ERROR, "Failed to set count"); + ret = dict_set_int32 (ctx_dict, "count", current_index); + if (ret) + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, + "Failed to set count"); } /* Setting the same index for the node, as is in the peerlist.*/ @@ -7835,7 +8007,7 @@ glusterd_volume_rebalance_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) snprintf (key, 256, "node-uuid-%d", current_index); ret = dict_set_dynstr (ctx_dict, key, node_uuid_str); if (ret) { - gf_log (THIS->name, GF_LOG_DEBUG, + gf_msg_debug (THIS->name, 0, "failed to set node-uuid"); } } @@ -7847,7 +8019,7 @@ glusterd_volume_rebalance_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) snprintf (key, 256, "files-%d", current_index); ret = dict_set_uint64 (ctx_dict, key, value); if (ret) { - gf_log (THIS->name, GF_LOG_DEBUG, + gf_msg_debug (THIS->name, 0, "failed to set the file count"); } } @@ -7860,7 +8032,7 @@ glusterd_volume_rebalance_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) snprintf (key, 256, "size-%d", current_index); ret = dict_set_uint64 (ctx_dict, key, value); if (ret) { - gf_log (THIS->name, GF_LOG_DEBUG, + gf_msg_debug (THIS->name, 0, "failed to set the size of migration"); } } @@ -7873,7 +8045,7 @@ glusterd_volume_rebalance_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) snprintf (key, 256, "lookups-%d", current_index); ret = dict_set_uint64 (ctx_dict, key, value); if (ret) { - gf_log (THIS->name, GF_LOG_DEBUG, + gf_msg_debug (THIS->name, 0, "failed to set lookuped file count"); } } @@ -7886,7 +8058,7 @@ glusterd_volume_rebalance_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) snprintf (key, 256, "status-%d", current_index); ret = dict_set_int32 (ctx_dict, key, value32); if (ret) { - gf_log (THIS->name, GF_LOG_DEBUG, + gf_msg_debug (THIS->name, 0, "failed to set status"); } } @@ -7899,7 +8071,7 @@ glusterd_volume_rebalance_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) snprintf (key, 256, "failures-%d", current_index); ret = dict_set_uint64 (ctx_dict, key, value); if (ret) { - gf_log (THIS->name, GF_LOG_DEBUG, + gf_msg_debug (THIS->name, 0, "failed to set failure count"); } } @@ -7912,7 +8084,7 @@ glusterd_volume_rebalance_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) snprintf (key, 256, "skipped-%d", current_index); ret = dict_set_uint64 (ctx_dict, key, value); if (ret) { - gf_log (THIS->name, GF_LOG_DEBUG, + gf_msg_debug (THIS->name, 0, "failed to set skipped count"); } } @@ -7924,7 +8096,7 @@ glusterd_volume_rebalance_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) snprintf (key, 256, "run-time-%d", current_index); ret = dict_set_double (ctx_dict, key, elapsed_time); if (ret) { - gf_log (THIS->name, GF_LOG_DEBUG, + gf_msg_debug (THIS->name, 0, "failed to set run-time"); } } @@ -7972,7 +8144,9 @@ glusterd_sys_exec_output_rsp_dict (dict_t *dst, dict_t *src) int dst_output_count = 0; if (!dst || !src) { - gf_log ("", GF_LOG_ERROR, "Source or Destination " + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_DICT_EMPTY, + "Source or Destination " "dict is empty."); goto out; } @@ -7981,7 +8155,7 @@ glusterd_sys_exec_output_rsp_dict (dict_t *dst, dict_t *src) ret = dict_get_int32 (src, "output_count", &src_output_count); if (ret) { - gf_log ("", GF_LOG_DEBUG, "No output from source"); + gf_msg_debug ("", 0, "No output from source"); ret = 0; goto out; } @@ -7992,7 +8166,9 @@ glusterd_sys_exec_output_rsp_dict (dict_t *dst, dict_t *src) output_name[len] = '\0'; ret = dict_get_str (src, output_name, &output); if (ret) { - gf_log ("", GF_LOG_ERROR, "Unable to fetch %s", + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "Unable to fetch %s", output_name); goto out; } @@ -8002,7 +8178,9 @@ glusterd_sys_exec_output_rsp_dict (dict_t *dst, dict_t *src) output_name[len] = '\0'; ret = dict_set_dynstr (dst, output_name, gf_strdup (output)); if (ret) { - gf_log ("", GF_LOG_ERROR, "Unable to set %s", + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, + "Unable to set %s", output_name); goto out; } @@ -8011,7 +8189,7 @@ glusterd_sys_exec_output_rsp_dict (dict_t *dst, dict_t *src) ret = dict_set_int32 (dst, "output_count", dst_output_count+src_output_count); out: - gf_log ("", GF_LOG_DEBUG, "Returning %d", ret); + gf_msg_debug ("", 0, "Returning %d", ret); return ret; } @@ -8046,12 +8224,14 @@ glusterd_volume_heal_use_rsp_dict (dict_t *aggr, dict_t *rsp_dict) ret = dict_get_bin (aggr, "transaction_id", (void **)&txn_id); if (ret) goto out; - gf_log (THIS->name, GF_LOG_DEBUG, "transaction ID = %s", + gf_msg_debug (THIS->name, 0, "transaction ID = %s", uuid_utoa (*txn_id)); ret = glusterd_get_txn_opinfo (txn_id, &txn_op_info); if (ret) { - gf_log (THIS->name, GF_LOG_ERROR, "Failed to get txn_op_info " + gf_msg (THIS->name, GF_LOG_ERROR, 0, + GD_MSG_TRANS_OPINFO_GET_FAIL, + "Failed to get txn_op_info " "for txn_id = %s", uuid_utoa (*txn_id)); goto out; } @@ -8107,7 +8287,9 @@ glusterd_volume_quota_copy_to_op_ctx_dict (dict_t *dict, dict_t *rsp_dict) ret = dict_get_int32 (dict, "type", &type); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to get quota opcode"); + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "Failed to get quota opcode"); goto out; } @@ -8122,7 +8304,9 @@ glusterd_volume_quota_copy_to_op_ctx_dict (dict_t *dict, dict_t *rsp_dict) ret = dict_get_int32 (rsp_dict, "count", &rsp_dict_count); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to get the count of " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "Failed to get the count of " "gfids from the rsp dict"); goto out; } @@ -8133,7 +8317,7 @@ glusterd_volume_quota_copy_to_op_ctx_dict (dict_t *dict, dict_t *rsp_dict) * called after self-staging on the originator. This must not * be treated as error. */ - gf_log (this->name, GF_LOG_DEBUG, "Failed to get count of gfids" + gf_msg_debug (this->name, 0, "Failed to get count of gfids" " from req dict. This could be because count is not yet" " copied from rsp_dict into op_ctx"); @@ -8142,7 +8326,9 @@ glusterd_volume_quota_copy_to_op_ctx_dict (dict_t *dict, dict_t *rsp_dict) ret = dict_get_str (rsp_dict, key, &uuid_str); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to get gfid " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "Failed to get gfid " "from rsp dict"); goto out; } @@ -8157,7 +8343,9 @@ glusterd_volume_quota_copy_to_op_ctx_dict (dict_t *dict, dict_t *rsp_dict) ret = dict_set_dynstr (dict, key, uuid_str_dup); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to set gfid " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, + "Failed to set gfid " "from rsp dict into req dict"); GF_FREE (uuid_str_dup); goto out; @@ -8166,7 +8354,9 @@ glusterd_volume_quota_copy_to_op_ctx_dict (dict_t *dict, dict_t *rsp_dict) ret = dict_set_int32 (dict, "count", rsp_dict_count + count); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to set aggregated " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, + "Failed to set aggregated " "count in req dict"); goto out; } @@ -8375,13 +8565,17 @@ glusterd_heal_volume_brick_rsp (dict_t *req_dict, dict_t *rsp_dict, ret = dict_get_str (req_dict, "volname", &volname); if (ret) { - gf_log ("", GF_LOG_ERROR, "Unable to get volume name"); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "Unable to get volume name"); goto out; } ret = dict_get_int32 (req_dict, "heal-op", &heal_op); if (ret) { - gf_log ("", GF_LOG_ERROR, "Unable to get heal_op"); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "Unable to get heal_op"); goto out; } @@ -8442,7 +8636,9 @@ glusterd_status_volume_brick_rsp (dict_t *rsp_dict, dict_t *op_ctx, } ret = dict_get_int32 (rsp_dict, "index", &index); if (ret) { - gf_log (THIS->name, GF_LOG_ERROR, "Couldn't get node index"); + gf_msg (THIS->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "Couldn't get node index"); goto out; } dict_del (rsp_dict, "index"); @@ -8474,7 +8670,9 @@ glusterd_defrag_volume_node_rsp (dict_t *req_dict, dict_t *rsp_dict, ret = dict_get_str (req_dict, "volname", &volname); if (ret) { - gf_log ("", GF_LOG_ERROR, "Unable to get volume name"); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "Unable to get volume name"); goto out; } @@ -8498,7 +8696,9 @@ glusterd_defrag_volume_node_rsp (dict_t *req_dict, dict_t *rsp_dict, ret = dict_set_int32 (op_ctx, "count", i); if (ret) - gf_log (THIS->name, GF_LOG_ERROR, "Failed to set count"); + gf_msg (THIS->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, + "Failed to set count"); snprintf (buf, 1024, "%s", uuid_utoa (MY_UUID)); node_str = gf_strdup (buf); @@ -8506,56 +8706,64 @@ glusterd_defrag_volume_node_rsp (dict_t *req_dict, dict_t *rsp_dict, snprintf (key, 256, "node-uuid-%d",i); ret = dict_set_dynstr (op_ctx, key, node_str); 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 node-uuid"); memset (key, 0 , 256); snprintf (key, 256, "files-%d", i); ret = dict_set_uint64 (op_ctx, key, volinfo->rebal.rebalance_files); 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 file count"); memset (key, 0 , 256); snprintf (key, 256, "size-%d", i); ret = dict_set_uint64 (op_ctx, key, volinfo->rebal.rebalance_data); 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 size of xfer"); memset (key, 0 , 256); snprintf (key, 256, "lookups-%d", i); ret = dict_set_uint64 (op_ctx, key, volinfo->rebal.lookedup_files); 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 lookedup file count"); memset (key, 0 , 256); snprintf (key, 256, "status-%d", i); ret = dict_set_int32 (op_ctx, key, volinfo->rebal.defrag_status); 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 status"); memset (key, 0 , 256); snprintf (key, 256, "failures-%d", i); ret = dict_set_uint64 (op_ctx, key, volinfo->rebal.rebalance_failures); 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 failure count"); memset (key, 0 , 256); snprintf (key, 256, "skipped-%d", i); ret = dict_set_uint64 (op_ctx, key, volinfo->rebal.skipped_files); 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 skipped count"); memset (key, 0, 256); snprintf (key, 256, "run-time-%d", i); ret = dict_set_double (op_ctx, key, volinfo->rebal.rebalance_time); 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 run-time"); memset (key, 0 , 256); @@ -8608,7 +8816,7 @@ glusterd_handle_node_rsp (dict_t *req_dict, void *pending_entry, break; } - gf_log ("", GF_LOG_DEBUG, "Returning %d", ret); + gf_msg_debug ("", 0, "Returning %d", ret); return ret; } @@ -8631,7 +8839,8 @@ glusterd_set_originator_uuid (dict_t *dict) ret = dict_set_bin (dict, "originator_uuid", originator_uuid, sizeof (uuid_t)); if (ret) { - gf_log ("", GF_LOG_ERROR, + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, "Failed to set originator_uuid."); goto out; } @@ -8696,7 +8905,8 @@ glusterd_generate_and_set_task_id (dict_t *dict, char *key) ret = dict_set_dynstr (dict, key, uuid_str); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to set %s in dict", + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, "Failed to set %s in dict", key); goto out; } @@ -8727,7 +8937,8 @@ glusterd_copy_uuid_to_dict (uuid_t uuid, dict_t *dict, char *key) ret = dict_set_dynstr (dict, key, task_id_str); if (ret) { GF_FREE (task_id_str); - gf_log (THIS->name, GF_LOG_ERROR, + gf_msg (THIS->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, "Error setting uuid in dict with key %s", key); } @@ -8828,7 +9039,8 @@ op_version_check (xlator_t *this, int min_op_version, char *msg, int msglen) snprintf (msg, msglen, "One or more nodes do not support " "the required op-version. Cluster op-version must " "atleast be %d.", min_op_version); - gf_log (this->name, GF_LOG_ERROR, "%s", msg); + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_UNSUPPORTED_VERSION, "%s", msg); ret = -1; } return ret; @@ -8860,7 +9072,9 @@ glusterd_is_status_tasks_op (glusterd_op_t op, dict_t *dict) ret = dict_get_uint32 (dict, "cmd", &cmd); if (ret) { - gf_log (THIS->name, GF_LOG_ERROR, "Failed to get opcode"); + gf_msg (THIS->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "Failed to get opcode"); goto out; } @@ -8975,7 +9189,9 @@ glusterd_validate_and_set_gfid (dict_t *op_ctx, dict_t *req_dict, ret = dict_get_int32 (op_ctx, "type", &op_code); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to get quota opcode"); + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "Failed to get quota opcode"); goto out; } @@ -8989,13 +9205,17 @@ glusterd_validate_and_set_gfid (dict_t *op_ctx, dict_t *req_dict, ret = dict_get_str (op_ctx, "path", &path); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to get path"); + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "Failed to get path"); goto out; } ret = dict_get_int32 (op_ctx, "count", &count); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to get count"); + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "Failed to get count"); goto out; } @@ -9022,7 +9242,9 @@ glusterd_validate_and_set_gfid (dict_t *op_ctx, dict_t *req_dict, ret = dict_get_str (op_ctx, key, &uuid1_str); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to get key '%s'", + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "Failed to get key '%s'", key); goto out; } @@ -9034,7 +9256,9 @@ glusterd_validate_and_set_gfid (dict_t *op_ctx, dict_t *req_dict, ret = dict_get_str (op_ctx, key, &uuid2_str); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to get key " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_GET_FAILED, + "Failed to get key " "'%s'", key); goto out; } @@ -9059,12 +9283,16 @@ glusterd_validate_and_set_gfid (dict_t *op_ctx, dict_t *req_dict, ret = dict_set_dynstr (req_dict, "gfid", uuid1_str_dup); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to set gfid"); + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, + "Failed to set gfid"); GF_FREE (uuid1_str_dup); goto out; } } else { - gf_log (this->name, GF_LOG_ERROR, "Failed to iterate through %d" + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_ITER_FAIL, + "Failed to iterate through %d" " entries in the req dict", count); ret = -1; goto out; @@ -9119,7 +9347,7 @@ glusterd_remove_auxiliary_mount (char *volname) GLUSTERFS_GET_AUX_MOUNT_PIDFILE (pidfile, volname); if (!gf_is_service_running (pidfile, NULL)) { - gf_log (this->name, GF_LOG_DEBUG, "Aux mount of volume %s " + gf_msg_debug (this->name, 0, "Aux mount of volume %s " "absent, hence returning", volname); return 0; } @@ -9127,7 +9355,8 @@ glusterd_remove_auxiliary_mount (char *volname) GLUSTERD_GET_QUOTA_AUX_MOUNT_PATH (mountdir, volname, "/"); ret = gf_umount_lazy (this->name, mountdir, 1); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "umount on %s failed, " + gf_msg (this->name, GF_LOG_ERROR, errno, + GD_MSG_LAZY_UMOUNT_FAIL, "umount on %s failed, " "reason : %s", mountdir, strerror (errno)); /* Hide EBADF as it means the mount is already gone */ @@ -9211,7 +9440,8 @@ glusterd_launch_synctask (synctask_fn_t fn, void *opaque) ret = synctask_new (this->ctx->env, fn, gd_default_synctask_cbk, NULL, opaque); if (ret) - gf_log (this->name, GF_LOG_CRITICAL, "Failed to spawn bricks" + gf_msg (this->name, GF_LOG_CRITICAL, 0, + GD_MSG_SPAWN_SVCS_FAIL, "Failed to spawn bricks" " and other volume related services"); } @@ -9322,7 +9552,9 @@ glusterd_update_mntopts (char *brick_path, glusterd_brickinfo_t *brickinfo) ret = glusterd_get_brick_root (brick_path, &mnt_pt); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "getting the root " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_BRICKPATH_ROOT_GET_FAIL, + "getting the root " "of the brick (%s) failed ", brick_path); goto out; } @@ -9330,7 +9562,9 @@ glusterd_update_mntopts (char *brick_path, glusterd_brickinfo_t *brickinfo) entry = glusterd_get_mnt_entry_info (mnt_pt, buff, sizeof (buff), &save_entry); if (!entry) { - gf_log (this->name, GF_LOG_ERROR, "getting the mount entry for " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_MNTENTRY_GET_FAIL, + "getting the mount entry for " "the brick (%s) failed", brick_path); ret = -1; goto out; @@ -9363,14 +9597,18 @@ glusterd_get_value_for_vme_entry (struct volopt_map_entry *vme, char **def_val) CDS_INIT_LIST_HEAD (&vol_opt_handle.list); if (_get_xlator_opt_key_from_vme (vme, &key)) { - gf_log (this->name, GF_LOG_ERROR, "Failed to get %s key from " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_GET_KEY_FAILED, + "Failed to get %s key from " "volume option entry", vme->key); goto out; } ret = xlator_volopt_dynload (vme->voltype, &dl_handle, &vol_opt_handle); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "xlator_volopt_dynload error " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_XLATOR_VOLOPT_DYNLOAD_ERROR, + "xlator_volopt_dynload error " "(%d)", ret); ret = -2; goto cont; @@ -9380,7 +9618,9 @@ glusterd_get_value_for_vme_entry (struct volopt_map_entry *vme, char **def_val) &local_def_val, &descr); if (ret) { /*Swallow Error if option not found*/ - gf_log (this->name, GF_LOG_ERROR, "Failed to get option for %s " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_GET_KEY_FAILED, + "Failed to get option for %s " "key", key); ret = -2; goto cont; @@ -9405,7 +9645,7 @@ cont: goto out; out: - gf_log (this->name, GF_LOG_DEBUG, "Returning %d", ret); + gf_msg_debug (this->name, 0, "Returning %d", ret); return ret; } @@ -9430,7 +9670,9 @@ glusterd_get_default_val_for_volopt (dict_t *ctx, gf_boolean_t all_opts, /* Check whether key is passed for a single option */ if (!all_opts && !input_key) { - gf_log (this->name, GF_LOG_ERROR, "Key is NULL"); + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_KEY_NULL, + "Key is NULL"); goto out; } @@ -9457,14 +9699,18 @@ glusterd_get_default_val_for_volopt (dict_t *ctx, gf_boolean_t all_opts, sprintf (dict_key, "key%d", count); ret = dict_set_str(ctx, dict_key, vme->key); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, + "Failed to " "set %s in dictionary", vme->key); goto out; } sprintf (dict_key, "value%d", count); ret = dict_set_dynstr_with_alloc (ctx, dict_key, def_val); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, + "Failed to " "set %s for key %s in dictionary", def_val, vme->key); goto out; @@ -9479,7 +9725,9 @@ glusterd_get_default_val_for_volopt (dict_t *ctx, gf_boolean_t all_opts, ret = dict_set_int32 (ctx, "count", count); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed to set count " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_DICT_SET_FAILED, + "Failed to set count " "in dictionary"); } @@ -9489,7 +9737,7 @@ out: "option %s does not exist", orig_key); *op_errstr = gf_strdup (err_str); } - gf_log (this->name, GF_LOG_DEBUG, "Returning %d", ret); + gf_msg_debug (this->name, 0, "Returning %d", ret); return ret; } @@ -9529,7 +9777,7 @@ glusterd_get_volopt_content (dict_t * ctx, gf_boolean_t xml_out) def_val = vme->value; } else { if (_get_xlator_opt_key_from_vme (vme, &key)) { - gf_log ("glusterd", GF_LOG_DEBUG, "Failed to " + gf_msg_debug ("glusterd", 0, "Failed to " "get %s key from volume option entry", vme->key); goto out; /*Some error while geting key*/ @@ -9540,7 +9788,7 @@ glusterd_get_volopt_content (dict_t * ctx, gf_boolean_t xml_out) &vol_opt_handle); if (ret) { - gf_log ("glusterd", GF_LOG_DEBUG, + gf_msg_debug ("glusterd", 0, "xlator_volopt_dynload error(%d)", ret); ret = 0; goto cont; @@ -9549,7 +9797,7 @@ glusterd_get_volopt_content (dict_t * ctx, gf_boolean_t xml_out) ret = xlator_option_info_list (&vol_opt_handle, key, &def_val, &descr); if (ret) { /*Swallow Error i.e if option not found*/ - gf_log ("glusterd", GF_LOG_DEBUG, + gf_msg_debug ("glusterd", 0, "Failed to get option for %s key", key); ret = 0; goto cont; @@ -9564,7 +9812,9 @@ glusterd_get_volopt_content (dict_t * ctx, gf_boolean_t xml_out) goto cont; } #else - gf_log ("glusterd", GF_LOG_ERROR, "Libxml not present"); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_MODULE_NOT_INSTALLED, + "Libxml not present"); #endif } else { snprintf (tmp_str, sizeof (tmp_str), "Option: %s\nDefault " @@ -9592,7 +9842,9 @@ cont: goto out; #else if (xml_out) - gf_log ("glusterd", GF_LOG_ERROR, "Libxml not present"); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_MODULE_NOT_INSTALLED, + "Libxml not present"); #endif if (!xml_out) @@ -9601,7 +9853,9 @@ cont: #if (HAVE_LIB_XML) output = gf_strdup ((char *)buf->content); #else - gf_log ("glusterd", GF_LOG_ERROR, "Libxml not present"); + gf_msg ("glusterd", GF_LOG_ERROR, 0, + GD_MSG_MODULE_NOT_INSTALLED, + "Libxml not present"); #endif if (NULL == output) { @@ -9611,7 +9865,7 @@ cont: ret = dict_set_dynstr (ctx, "help-str", output); out: - gf_log ("glusterd", GF_LOG_DEBUG, "Returning %d", ret); + gf_msg_debug ("glusterd", 0, "Returning %d", ret); return ret; } @@ -9641,7 +9895,9 @@ glusterd_check_client_op_version_support (char *volname, uint32_t op_version, pthread_mutex_unlock (&priv->xprt_lock); if (ret) { - gf_log (this->name, GF_LOG_ERROR, "One or more clients " + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_UNSUPPORTED_VERSION, + "One or more clients " "don't support the required op-version"); if (op_errstr) ret = gf_asprintf (op_errstr, "One or more connected " |