removed reference to GF_LOG_NORMAL

instead used GF_LOG_INFO, which is more standard log level.

Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Vijay Bellur <vijay@gluster.com>

BUG: 2669 (RuntimeError: cannot recognize log level "normal")
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2669

8 files changed, 85 insertions, 85 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index f6b0ddf9a..0a43ef9b6 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -375,7 +375,7 @@ glusterd_friend_find (uuid_t uuid, char *hostname,
                 ret = glusterd_friend_find_by_uuid (uuid, peerinfo);
 
                 if (ret) {
-                        gf_log ("glusterd", GF_LOG_NORMAL,
+                        gf_log ("glusterd", GF_LOG_INFO,
                                  "Unable to find peer by uuid");
                 } else {
                         goto out;
@@ -387,7 +387,7 @@ glusterd_friend_find (uuid_t uuid, char *hostname,
                 ret = glusterd_friend_find_by_hostname (hostname, peerinfo);
 
                 if (ret) {
-                        gf_log ("glusterd", GF_LOG_NORMAL,
+                        gf_log ("glusterd", GF_LOG_INFO,
                                 "Unable to find hostname: %s", hostname);
                 } else {
                         goto out;
@@ -417,7 +417,7 @@ glusterd_op_txn_begin ()
         }
 
         locked = 1;
-        gf_log ("glusterd", GF_LOG_NORMAL, "Acquired local lock");
+        gf_log ("glusterd", GF_LOG_INFO, "Acquired local lock");
 
         ret = glusterd_op_sm_inject_event (GD_OP_EVENT_START_LOCK, NULL);
 
@@ -444,7 +444,7 @@ glusterd_handle_cluster_lock (rpcsvc_request_t *req)
                 goto out;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Received LOCK from uuid: %s", uuid_utoa (lock_req.uuid));
 
 
@@ -484,7 +484,7 @@ glusterd_req_ctx_create (rpcsvc_request_t *rpc_req,
         char                            *dup_volname = NULL;
 
         uuid_unparse (uuid, str);
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Received op from uuid: %s", str);
 
         dict = dict_new ();
@@ -619,7 +619,7 @@ glusterd_handle_cli_probe (rpcsvc_request_t *req)
 
         gf_cmd_log ("peer probe", " on host %s:%d", cli_req.hostname,
                     cli_req.port);
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received CLI probe req %s %d",
+        gf_log ("glusterd", GF_LOG_INFO, "Received CLI probe req %s %d",
                 cli_req.hostname, cli_req.port);
 
         if (!(ret = glusterd_is_local_addr(cli_req.hostname))) {
@@ -683,7 +683,7 @@ glusterd_handle_cli_deprobe (rpcsvc_request_t *req)
                 goto out;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received CLI deprobe req");
+        gf_log ("glusterd", GF_LOG_INFO, "Received CLI deprobe req");
 
         ret = glusterd_hostname_to_uuid (cli_req.hostname, uuid);
         if (ret) {
@@ -747,7 +747,7 @@ glusterd_handle_cli_list_friends (rpcsvc_request_t *req)
                 goto out;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received cli list req");
+        gf_log ("glusterd", GF_LOG_INFO, "Received cli list req");
 
         if (cli_req.dict.dict_len) {
                 /* Unserialize the dictionary */
@@ -793,7 +793,7 @@ glusterd_handle_cli_get_volume (rpcsvc_request_t *req)
                 goto out;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received get vol req");
+        gf_log ("glusterd", GF_LOG_INFO, "Received get vol req");
 
         if (cli_req.dict.dict_len) {
                 /* Unserialize the dictionary */
@@ -897,7 +897,7 @@ glusterd_handle_create_volume (rpcsvc_request_t *req)
                 goto out;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received create volume req");
+        gf_log ("glusterd", GF_LOG_INFO, "Received create volume req");
 
         if (cli_req.bricks.bricks_len) {
                 /* Unserialize the dictionary */
@@ -1074,7 +1074,7 @@ glusterd_handle_cli_start_volume (rpcsvc_request_t *req)
                 goto out;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received start vol req"
+        gf_log ("glusterd", GF_LOG_INFO, "Received start vol req"
                 "for volume %s", cli_req.volname);
 
         dict = dict_new ();
@@ -1146,7 +1146,7 @@ glusterd_handle_cli_stop_volume (rpcsvc_request_t *req)
                 goto out;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received stop vol req"
+        gf_log ("glusterd", GF_LOG_INFO, "Received stop vol req"
                 "for volume %s", cli_req.volname);
 
         dict = dict_new ();
@@ -1216,7 +1216,7 @@ glusterd_handle_cli_delete_volume (rpcsvc_request_t *req)
         }
         gf_cmd_log ("Volume delete","on volname: %s attempted", cli_req.volname);
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received delete vol req"
+        gf_log ("glusterd", GF_LOG_INFO, "Received delete vol req"
                 "for volume %s", cli_req.volname);
 
 
@@ -1302,7 +1302,7 @@ glusterd_handle_add_brick (rpcsvc_request_t *req)
 
         gf_cmd_log ("Volume add-brick", "on volname: %s attempted",
                     cli_req.volname);
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received add brick req");
+        gf_log ("glusterd", GF_LOG_INFO, "Received add brick req");
 
         if (cli_req.bricks.bricks_len) {
                 /* Unserialize the dictionary */
@@ -1498,7 +1498,7 @@ glusterd_handle_replace_brick (rpcsvc_request_t *req)
                 goto out;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received replace brick req");
+        gf_log ("glusterd", GF_LOG_INFO, "Received replace brick req");
 
         if (cli_req.bricks.bricks_len) {
                 /* Unserialize the dictionary */
@@ -1560,7 +1560,7 @@ glusterd_handle_replace_brick (rpcsvc_request_t *req)
                         break;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received replace brick %s request", operation);
+        gf_log ("glusterd", GF_LOG_INFO, "Received replace brick %s request", operation);
         gf_cmd_log ("Volume replace-brick","volname: %s src_brick:%s"
                     " dst_brick:%s op:%s",cli_req.volname, src_brick, dst_brick
                     ,operation);
@@ -1877,7 +1877,7 @@ glusterd_handle_remove_brick (rpcsvc_request_t *req)
         }
 
         gf_cmd_log ("Volume remove-brick","on volname: %s attempted",cli_req.volname);
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received rem brick req");
+        gf_log ("glusterd", GF_LOG_INFO, "Received rem brick req");
 
         if (cli_req.bricks.bricks_len) {
                 /* Unserialize the dictionary */
@@ -1977,7 +1977,7 @@ glusterd_handle_remove_brick (rpcsvc_request_t *req)
 
                         if ((!strcmp (tmp->hostname,brickinfo->hostname)) &&
                             !strcmp (tmp->path, brickinfo->path)) {
-                                gf_log ("", GF_LOG_NORMAL, "Found brick");
+                                gf_log ("", GF_LOG_INFO, "Found brick");
                                 if (!sub_volume && volinfo->sub_count) {
                                         sub_volume = (pos / volinfo->
                                                       sub_count) + 1;
@@ -2066,7 +2066,7 @@ glusterd_handle_log_filename (rpcsvc_request_t *req)
                 goto out;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received log filename req "
+        gf_log ("glusterd", GF_LOG_INFO, "Received log filename req "
                 "for volume %s", cli_req.volname);
 
         dict = dict_new ();
@@ -2138,7 +2138,7 @@ glusterd_handle_log_locate (rpcsvc_request_t *req)
                 goto out;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received log locate req "
+        gf_log ("glusterd", GF_LOG_INFO, "Received log locate req "
                 "for volume %s", cli_req.volname);
 
         if (strchr (cli_req.brick, ':')) {
@@ -2247,7 +2247,7 @@ glusterd_handle_log_rotate (rpcsvc_request_t *req)
                 goto out;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received log rotate req "
+        gf_log ("glusterd", GF_LOG_INFO, "Received log rotate req "
                 "for volume %s", cli_req.volname);
 
         dict = dict_new ();
@@ -2315,7 +2315,7 @@ glusterd_handle_sync_volume (rpcsvc_request_t *req)
                 req->rpc_err = GARBAGE_ARGS;
                 goto out;
         }
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received volume sync req "
+        gf_log ("glusterd", GF_LOG_INFO, "Received volume sync req "
                 "for volume %s",
                 (cli_req.flags & GF_CLI_SYNC_ALL) ? "all" : cli_req.volname);
 
@@ -2501,7 +2501,7 @@ glusterd_op_lock_send_resp (rpcsvc_request_t *req, int32_t status)
         ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL,
                                      gd_xdr_serialize_mgmt_cluster_lock_rsp);
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Responded, ret: %d", ret);
 
         return 0;
@@ -2521,7 +2521,7 @@ glusterd_op_unlock_send_resp (rpcsvc_request_t *req, int32_t status)
         ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL,
                                      gd_xdr_serialize_mgmt_cluster_unlock_rsp);
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Responded to unlock, ret: %d", ret);
 
         return ret;
@@ -2543,7 +2543,7 @@ glusterd_handle_cluster_unlock (rpcsvc_request_t *req)
         }
 
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Received UNLOCK from uuid: %s", uuid_utoa (unlock_req.uuid));
 
         ctx = GF_CALLOC (1, sizeof (*ctx), gf_gld_mt_op_lock_ctx_t);
@@ -2593,7 +2593,7 @@ glusterd_op_stage_send_resp (rpcsvc_request_t   *req,
         ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL,
                                      gd_xdr_serialize_mgmt_stage_op_rsp);
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Responded to stage, ret: %d", ret);
         if (rsp.dict.dict_val)
                 GF_FREE (rsp.dict.dict_val);
@@ -2632,7 +2632,7 @@ glusterd_op_commit_send_resp (rpcsvc_request_t *req,
         ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL,
                                      gd_xdr_serialize_mgmt_commit_op_rsp);
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Responded to commit, ret: %d", ret);
 
 out:
@@ -2655,7 +2655,7 @@ glusterd_handle_incoming_friend_req (rpcsvc_request_t *req)
                 goto out;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Received probe from uuid: %s", uuid_utoa (friend_req.uuid));
         ret = glusterd_handle_friend_req (req, friend_req.uuid,
                                           friend_req.hostname, friend_req.port,
@@ -2693,7 +2693,7 @@ glusterd_handle_incoming_unfriend_req (rpcsvc_request_t *req)
                 goto out;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Received unfriend from uuid: %s", uuid_utoa (friend_req.uuid));
 
         ret = glusterd_remote_hostname_get (req, remote_hostname,
@@ -2802,7 +2802,7 @@ glusterd_handle_friend_update (rpcsvc_request_t *req)
                         "from unknown peer %s", uuid_utoa (friend_req.uuid));
                 goto out;
         }
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Received friend update from uuid: %s", uuid_utoa (friend_req.uuid));
 
         if (friend_req.friends.friends_len) {
@@ -2847,11 +2847,11 @@ glusterd_handle_friend_update (rpcsvc_request_t *req)
                 if (ret)
                         goto out;
 
-                gf_log ("", GF_LOG_NORMAL, "Received uuid: %s, hostname:%s",
+                gf_log ("", GF_LOG_INFO, "Received uuid: %s, hostname:%s",
                                 uuid_buf, hostname);
 
                 if (!uuid_compare (uuid, priv->uuid)) {
-                        gf_log ("", GF_LOG_NORMAL, "Received my uuid as Friend");
+                        gf_log ("", GF_LOG_INFO, "Received my uuid as Friend");
                         i++;
                         continue;
                 }
@@ -2923,7 +2923,7 @@ glusterd_handle_probe_query (rpcsvc_request_t *req)
         else
                 port = GF_DEFAULT_BASE_PORT;
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Received probe from uuid: %s", uuid_utoa (probe_req.uuid));
 
         ret = glusterd_remote_hostname_get (req, remote_hostname,
@@ -2937,7 +2937,7 @@ glusterd_handle_probe_query (rpcsvc_request_t *req)
                 rsp.op_ret = -1;
                 rsp.op_errno = GF_PROBE_ANOTHER_CLUSTER;
         } else if (ret) {
-                gf_log ("glusterd", GF_LOG_NORMAL, "Unable to find peerinfo"
+                gf_log ("glusterd", GF_LOG_INFO, "Unable to find peerinfo"
                         " for host: %s (%d)", remote_hostname, port);
                 args.mode = GD_MODE_ON;
                 ret = glusterd_friend_add (remote_hostname, port,
@@ -2957,7 +2957,7 @@ glusterd_handle_probe_query (rpcsvc_request_t *req)
         ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL,
                                      gd_xdr_serialize_mgmt_probe_rsp);
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Responded to %s, op_ret: %d, "
+        gf_log ("glusterd", GF_LOG_INFO, "Responded to %s, op_ret: %d, "
                 "op_errno: %d, ret: %d", probe_req.hostname,
                 rsp.op_ret, rsp.op_errno, ret);
 
@@ -3000,7 +3000,7 @@ glusterd_handle_cli_profile_volume (rpcsvc_request_t *req)
                 goto out;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received volume profile req "
+        gf_log ("glusterd", GF_LOG_INFO, "Received volume profile req "
                 "for volume %s", cli_req.volname);
 
         dict = dict_new ();
@@ -3225,7 +3225,7 @@ out:
                 }
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "connect returned %d", ret);
+        gf_log ("glusterd", GF_LOG_INFO, "connect returned %d", ret);
         return ret;
 }
 
@@ -3242,7 +3242,7 @@ glusterd_probe_begin (rpcsvc_request_t *req, const char *hoststr, int port)
         ret = glusterd_friend_find (NULL, (char *)hoststr, &peerinfo);
 
         if (ret) {
-                gf_log ("glusterd", GF_LOG_NORMAL, "Unable to find peerinfo"
+                gf_log ("glusterd", GF_LOG_INFO, "Unable to find peerinfo"
                         " for host: %s (%d)", hoststr, port);
                 args.mode = GD_MODE_ON;
                 args.req  = req;
@@ -3293,7 +3293,7 @@ glusterd_deprobe_begin (rpcsvc_request_t *req, const char *hoststr, int port,
         ret = glusterd_friend_find (uuid, (char *)hoststr, &peerinfo);
 
         if (ret) {
-                gf_log ("glusterd", GF_LOG_NORMAL, "Unable to find peerinfo"
+                gf_log ("glusterd", GF_LOG_INFO, "Unable to find peerinfo"
                         " for host: %s %d", hoststr, port);
                 goto out;
         }
@@ -3361,7 +3361,7 @@ glusterd_xfer_friend_remove_resp (rpcsvc_request_t *req, char *hostname, int por
         ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL,
                                      gd_xdr_serialize_mgmt_friend_rsp);
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Responded to %s (%d), ret: %d", hostname, port, ret);
         return ret;
 }
@@ -3392,7 +3392,7 @@ glusterd_xfer_friend_add_resp (rpcsvc_request_t *req, char *hostname, int port,
         ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL,
                                      gd_xdr_serialize_mgmt_friend_rsp);
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Responded to %s (%d), ret: %d", hostname, port, ret);
         if (rsp.hostname)
                 GF_FREE (rsp.hostname)
@@ -3416,7 +3416,7 @@ glusterd_xfer_cli_probe_resp (rpcsvc_request_t *req, int32_t op_ret,
         ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL,
                                      gf_xdr_serialize_cli_probe_rsp);
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Responded to CLI, ret: %d",ret);
+        gf_log ("glusterd", GF_LOG_INFO, "Responded to CLI, ret: %d",ret);
 
         return ret;
 }
@@ -3437,7 +3437,7 @@ glusterd_xfer_cli_deprobe_resp (rpcsvc_request_t *req, int32_t op_ret,
         ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL,
                                      gf_xdr_serialize_cli_deprobe_rsp);
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Responded to CLI, ret: %d",ret);
+        gf_log ("glusterd", GF_LOG_INFO, "Responded to CLI, ret: %d",ret);
 
         return ret;
 }
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index 3253c4f82..9eb39bebe 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -2884,7 +2884,7 @@ rb_do_operation_pause (glusterd_volinfo_t *volinfo,
 {
         int ret = -1;
 
-        gf_log ("", GF_LOG_NORMAL,
+        gf_log ("", GF_LOG_INFO,
                 "replace-brick send pause xattr");
 
         ret = rb_spawn_maintenance_client (volinfo, src_brickinfo);
@@ -3144,7 +3144,7 @@ rb_update_srcbrick_port (glusterd_brickinfo_t *src_brickinfo, dict_t *rsp_dict,
         }
 
         if (!glusterd_is_local_addr (src_brickinfo->hostname)) {
-                gf_log ("", GF_LOG_NORMAL,
+                gf_log ("", GF_LOG_INFO,
                         "adding src-brick port no");
 
                 src_brickinfo->port = pmap_registry_search (this,
@@ -3201,7 +3201,7 @@ rb_update_dstbrick_port (glusterd_brickinfo_t *dst_brickinfo, dict_t *rsp_dict,
         }
 
         if (!glusterd_is_local_addr (dst_brickinfo->hostname)) {
-                gf_log ("", GF_LOG_NORMAL,
+                gf_log ("", GF_LOG_INFO,
                         "adding dst-brick port no");
 
                 if (rsp_dict) {
@@ -3326,7 +3326,7 @@ glusterd_op_replace_brick (dict_t *dict, dict_t *rsp_dict)
         case GF_REPLACE_OP_START:
         {
                 if (!glusterd_is_local_addr (dst_brickinfo->hostname)) {
-                        gf_log ("", GF_LOG_NORMAL,
+                        gf_log ("", GF_LOG_INFO,
                                 "I AM THE DESTINATION HOST");
                         if (!glusterd_is_rb_paused (volinfo)) {
                                 ret = rb_spawn_destination_brick (volinfo, dst_brickinfo);
@@ -3353,7 +3353,7 @@ glusterd_op_replace_brick (dict_t *dict, dict_t *rsp_dict)
 		}
 
 		if (!glusterd_is_local_addr (dst_brickinfo->hostname)) {
-			gf_log ("", GF_LOG_NORMAL,
+			gf_log ("", GF_LOG_INFO,
 				"adding dst-brick port no");
 
                         ret = rb_update_dstbrick_port (dst_brickinfo, rsp_dict,
@@ -3376,7 +3376,7 @@ glusterd_op_replace_brick (dict_t *dict, dict_t *rsp_dict)
 
                 if (!glusterd_is_local_addr (dst_brickinfo->hostname) &&
                     replace_op != GF_REPLACE_OP_COMMIT_FORCE) {
-                        gf_log ("", GF_LOG_NORMAL,
+                        gf_log ("", GF_LOG_INFO,
                                 "I AM THE DESTINATION HOST");
                         ret = rb_kill_destination_brick (volinfo, dst_brickinfo);
                         if (ret) {
@@ -3458,7 +3458,7 @@ glusterd_op_replace_brick (dict_t *dict, dict_t *rsp_dict)
 		}
 
                 if (!glusterd_is_local_addr (dst_brickinfo->hostname)) {
-                        gf_log ("", GF_LOG_NORMAL,
+                        gf_log ("", GF_LOG_INFO,
                                 "I AM THE DESTINATION HOST");
                         ret = rb_kill_destination_brick (volinfo, dst_brickinfo);
                         if (ret) {
@@ -5791,7 +5791,7 @@ out:
                 opinfo.op_ret = ret;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Sent op req to %d peers",
+        gf_log ("glusterd", GF_LOG_INFO, "Sent op req to %d peers",
                 opinfo.pending_count);
 
         if (!opinfo.pending_count)
@@ -5908,7 +5908,7 @@ glusterd_op_ac_send_commit_op (glusterd_op_sm_event_t *event, void *ctx)
         }
 
         opinfo.pending_count = pending_count;
-        gf_log ("glusterd", GF_LOG_NORMAL, "Sent op req to %d peers",
+        gf_log ("glusterd", GF_LOG_INFO, "Sent op req to %d peers",
                 opinfo.pending_count);
 out:
         if (dict)
@@ -6326,7 +6326,7 @@ glusterd_op_txn_complete ()
                 goto out;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Cleared local lock");
+        gf_log ("glusterd", GF_LOG_INFO, "Cleared local lock");
 
         op_ret = opinfo.op_ret;
         op_errno = opinfo.op_errno;
diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
index a3556c19e..d5048549b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
@@ -332,7 +332,7 @@ glusterd_defrag_start (void *data)
 out:
         volinfo->defrag = NULL;
         if (defrag) {
-                gf_log ("rebalance", GF_LOG_NORMAL, "rebalance on %s complete",
+                gf_log ("rebalance", GF_LOG_INFO, "rebalance on %s complete",
                         defrag->mount);
 
                 snprintf (cmd_str, 1024, "umount -l %s", defrag->mount);
@@ -474,7 +474,7 @@ glusterd_rebalance_cmd_attempted_log (int cmd, char *volname)
                         break;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received rebalance volume %d on %s",
+        gf_log ("glusterd", GF_LOG_INFO, "Received rebalance volume %d on %s",
                 cmd, volname);
 }
 
diff --git a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
index 056378749..2b0f87fb0 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
@@ -430,7 +430,7 @@ glusterd3_1_probe_cbk (struct rpc_req *req, struct iovec *iov,
                 goto out;
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Received probe resp from uuid: %s, host: %s",
                 uuid_utoa (rsp.uuid), rsp.hostname);
         if (rsp.op_ret != 0) {
@@ -477,7 +477,7 @@ glusterd3_1_probe_cbk (struct rpc_req *req, struct iovec *iov,
                 glusterd_op_sm ();
         }
 
-        gf_log ("glusterd", GF_LOG_NORMAL, "Received resp to probe req");
+        gf_log ("glusterd", GF_LOG_INFO, "Received resp to probe req");
 
 out:
         if (rsp.hostname)
@@ -520,7 +520,7 @@ glusterd3_1_friend_add_cbk (struct rpc_req * req, struct iovec *iov,
         op_ret = rsp.op_ret;
         op_errno = rsp.op_errno;
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Received %s from uuid: %s, host: %s, port: %d",
                 (op_ret)?"RJT":"ACC", uuid_utoa (rsp.uuid), rsp.hostname, rsp.port);
 
@@ -620,7 +620,7 @@ glusterd3_1_friend_remove_cbk (struct rpc_req * req, struct iovec *iov,
         op_ret = rsp.op_ret;
         op_errno = rsp.op_errno;
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Received %s from uuid: %s, host: %s, port: %d",
                 (op_ret)?"RJT":"ACC", uuid_utoa (rsp.uuid), rsp.hostname, rsp.port);
 
@@ -702,7 +702,7 @@ glusterd3_1_friend_update_cbk (struct rpc_req *req, struct iovec *iov,
 
         op_ret = rsp.op_ret;
 */
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Received %s from uuid: %s",
                 (op_ret)?"RJT":"ACC", str);
 
@@ -739,7 +739,7 @@ glusterd3_1_cluster_lock_cbk (struct rpc_req *req, struct iovec *iov,
 
         op_ret = rsp.op_ret;
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Received %s from uuid: %s",
                 (op_ret)?"RJT":"ACC", uuid_utoa (rsp.uuid));
 
@@ -798,7 +798,7 @@ glusterd3_1_cluster_unlock_cbk (struct rpc_req *req, struct iovec *iov,
 
         op_ret = rsp.op_ret;
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Received %s from uuid: %s",
                 (op_ret)?"RJT":"ACC", uuid_utoa (rsp.uuid));
 
@@ -936,7 +936,7 @@ glusterd3_1_stage_op_cbk (struct rpc_req *req, struct iovec *iov,
 
         op_ret = rsp.op_ret;
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Received %s from uuid: %s",
                 (op_ret)?"RJT":"ACC", uuid_utoa (rsp.uuid));
 
@@ -1122,7 +1122,7 @@ glusterd3_1_commit_op_cbk (struct rpc_req *req, struct iovec *iov,
 
         op_ret = rsp.op_ret;
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                 "Received %s from uuid: %s",
                 (op_ret)?"RJT":"ACC", uuid_utoa (rsp.uuid));
 
diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.c b/xlators/mgmt/glusterd/src/glusterd-sm.c
index ce15ffdfc..94e7ca08a 100644
--- a/xlators/mgmt/glusterd/src/glusterd-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-sm.c
@@ -488,7 +488,7 @@ glusterd_ac_send_friend_update (glusterd_friend_sm_event_t *event, void *ctx)
                 ret = dict_set_str (friends, key, peerinfo->hostname);
                 if (ret)
                         goto out;
-                gf_log ("", GF_LOG_NORMAL, "Added uuid: %s, host: %s",
+                gf_log ("", GF_LOG_INFO, "Added uuid: %s, host: %s",
                         dup_buf, peerinfo->hostname);
         }
 
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index e1db5f454..8058adcd0 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -762,11 +762,11 @@ glusterd_store_delete_volume (glusterd_volinfo_t *volinfo)
                 else
                         ret = unlink (path);
 
-                gf_log ("", GF_LOG_NORMAL, "%s %s",
+                gf_log ("", GF_LOG_INFO, "%s %s",
                                 ret?"Failed to remove":"Removed",
                                 entry->d_name);
                 if (ret)
-                        gf_log ("", GF_LOG_NORMAL, "errno:%d", errno);
+                        gf_log ("", GF_LOG_INFO, "errno:%d", errno);
 stat_failed:
                 memset (path, 0, sizeof(path));
                 glusterd_for_each_entry (entry, dir);
@@ -1058,7 +1058,7 @@ glusterd_retrieve_uuid ()
                                              &uuid_str);
 
         if (ret) {
-                gf_log ("", GF_LOG_NORMAL, "No previous uuid is present");
+                gf_log ("", GF_LOG_INFO, "No previous uuid is present");
                 goto out;
         }
 
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index c4e555e8a..e8d107db7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -239,7 +239,7 @@ glusterd_lock (uuid_t   uuid)
         ret = glusterd_set_lock_owner (uuid);
 
         if (!ret) {
-                gf_log ("glusterd", GF_LOG_NORMAL, "Cluster lock held by"
+                gf_log ("glusterd", GF_LOG_INFO, "Cluster lock held by"
                          " %s", uuid_utoa (uuid));
         }
 
@@ -703,7 +703,7 @@ glusterd_volume_brickinfo_get (uuid_t uuid, char *hostname, char *path,
                 }
                 if ((!uuid_compare (peer_uuid, brickiter->uuid)) &&
                         !strcmp (brickiter->path, path)) {
-                        gf_log ("", GF_LOG_NORMAL, "Found brick");
+                        gf_log ("", GF_LOG_INFO, "Found brick");
                         ret = 0;
                         if (brickinfo)
                                 *brickinfo = brickiter;
@@ -732,7 +732,7 @@ glusterd_volume_brickinfo_get_by_brick (char *brick,
         GF_ASSERT (brick);
         GF_ASSERT (volinfo);
 
-        gf_log ("", GF_LOG_NORMAL, "brick: %s", brick);
+        gf_log ("", GF_LOG_INFO, "brick: %s", brick);
 
         dup_brick = gf_strdup (brick);
         if (!dup_brick) {
@@ -859,7 +859,7 @@ glusterd_service_stop (const char *service, char *pidfile, int sig,
         fclose (file);
         file = NULL;
 
-        gf_log ("", GF_LOG_NORMAL, "Stopping gluster %s running in pid: %d",
+        gf_log ("", GF_LOG_INFO, "Stopping gluster %s running in pid: %d",
                 service, pid);
 
         ret = kill (pid, sig);
@@ -1013,7 +1013,7 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t  *volinfo,
                 ret = lockf (fileno (file), F_TLOCK, 0);
                 if (ret && ((EAGAIN == errno) || (EACCES == errno))) {
                         ret = 0;
-                        gf_log ("", GF_LOG_NORMAL, "brick %s:%s "
+                        gf_log ("", GF_LOG_INFO, "brick %s:%s "
                                 "already started", brickinfo->hostname,
                                 brickinfo->path);
                         goto connect;
@@ -1029,7 +1029,7 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t  *volinfo,
                         ret = lockf (fileno (file), F_TLOCK, 0);
                         if (ret && ((EAGAIN == errno) || (EACCES == errno))) {
                                 ret = 0;
-                                gf_log ("", GF_LOG_NORMAL, "brick %s:%s "
+                                gf_log ("", GF_LOG_INFO, "brick %s:%s "
                                         "already started", brickinfo->hostname,
                                         brickinfo->path);
                                 goto connect;
@@ -1043,7 +1043,7 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t  *volinfo,
         }
         unlink (pidfile);
 
-        gf_log ("", GF_LOG_NORMAL, "About to start glusterfs"
+        gf_log ("", GF_LOG_INFO, "About to start glusterfs"
                 " for brick %s:%s", brickinfo->hostname,
                 brickinfo->path);
         GLUSTERD_REMOVE_SLASH_FROM_PATH (brickinfo->path, exp_path);
@@ -2096,17 +2096,17 @@ void
 glusterd_nfs_pmap_deregister ()
 {
         if (pmap_unset (MOUNT_PROGRAM, MOUNTV3_VERSION))
-                gf_log ("", GF_LOG_NORMAL, "De-registered MOUNTV3 successfully");
+                gf_log ("", GF_LOG_INFO, "De-registered MOUNTV3 successfully");
         else
                 gf_log ("", GF_LOG_ERROR, "De-register MOUNTV3 is unsuccessful");
 
         if (pmap_unset (MOUNT_PROGRAM, MOUNTV1_VERSION))
-                gf_log ("", GF_LOG_NORMAL, "De-registered MOUNTV1 successfully");
+                gf_log ("", GF_LOG_INFO, "De-registered MOUNTV1 successfully");
         else
                 gf_log ("", GF_LOG_ERROR, "De-register MOUNTV1 is unsuccessful");
 
         if (pmap_unset (NFS_PROGRAM, NFSV3_VERSION))
-                gf_log ("", GF_LOG_NORMAL, "De-registered NFSV3 successfully");
+                gf_log ("", GF_LOG_INFO, "De-registered NFSV3 successfully");
         else
                 gf_log ("", GF_LOG_ERROR, "De-register NFSV3 is unsuccessful");
 
@@ -2417,7 +2417,7 @@ glusterd_friend_find_by_uuid (uuid_t uuid,
         list_for_each_entry (entry, &priv->peers, uuid_list) {
                 if (!uuid_compare (entry->uuid, uuid)) {
 
-                        gf_log ("glusterd", GF_LOG_NORMAL,
+                        gf_log ("glusterd", GF_LOG_INFO,
                                  "Friend found... state: %s",
                         glusterd_friend_sm_state_name_get (entry->state.state));
                         *peerinfo = entry;
@@ -2456,7 +2456,7 @@ glusterd_friend_find_by_hostname (const char *hoststr,
                 if (!strncmp (entry->hostname, hoststr,
                               1024)) {
 
-                        gf_log ("glusterd", GF_LOG_NORMAL,
+                        gf_log ("glusterd", GF_LOG_INFO,
                                  "Friend %s found.. state: %d", hoststr,
                                   entry->state.state);
                         *peerinfo = entry;
@@ -2495,7 +2495,7 @@ glusterd_friend_find_by_hostname (const char *hoststr,
                         if (!strncmp (entry->hostname, host,
                             1024) || !strncmp (entry->hostname,hname,
                             1024)) {
-                                gf_log ("glusterd", GF_LOG_NORMAL,
+                                gf_log ("glusterd", GF_LOG_INFO,
                                         "Friend %s found.. state: %d",
                                         hoststr, entry->state.state);
                                 *peerinfo = entry;
@@ -2574,7 +2574,7 @@ glusterd_brick_stop (glusterd_volinfo_t *volinfo,
                 goto out;
         }
 
-        gf_log ("", GF_LOG_NORMAL, "About to stop glusterfs"
+        gf_log ("", GF_LOG_INFO, "About to stop glusterfs"
                 " for brick %s:%s", brickinfo->hostname,
                 brickinfo->path);
         ret = glusterd_volume_stop_glusterfs (volinfo, brickinfo);
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c
index b4df630d0..e1c338bc3 100644
--- a/xlators/mgmt/glusterd/src/glusterd.c
+++ b/xlators/mgmt/glusterd/src/glusterd.c
@@ -84,7 +84,7 @@ glusterd_uuid_init (int flag)
                 ret = glusterd_retrieve_uuid ();
                 if (!ret) {
                         uuid_copy (glusterd_uuid, priv->uuid);
-                        gf_log ("glusterd", GF_LOG_NORMAL,
+                        gf_log ("glusterd", GF_LOG_INFO,
                                 "retrieved UUID: %s", uuid_utoa (priv->uuid));
                         return 0;
                 }
@@ -92,7 +92,7 @@ glusterd_uuid_init (int flag)
 
         uuid_generate (glusterd_uuid);
 
-        gf_log ("glusterd", GF_LOG_NORMAL,
+        gf_log ("glusterd", GF_LOG_INFO,
                         "generated UUID: %s", uuid_utoa (glusterd_uuid));
         uuid_copy (priv->uuid, glusterd_uuid);
 
@@ -345,7 +345,7 @@ init (xlator_t *this)
                 first_time = 1;
         }
 
-        gf_log (this->name, GF_LOG_NORMAL, "Using %s as working directory",
+        gf_log (this->name, GF_LOG_INFO, "Using %s as working directory",
                 dirname);
 
         snprintf (cmd_log_filename, PATH_MAX,"%s/.cmd_log_history",