From afd354c13de6b0aac750f353db3fdbc5b53cc470 Mon Sep 17 00:00:00 2001
From: N Balachandran <nbalacha@redhat.com>
Date: Fri, 5 May 2017 15:35:11 +0530
Subject: [PATCH 312/316] cluster/dht Remove redundant logs in dht rmdir

Removing redundant logs were introduced in
https://review.gluster.org/#/c/17065/

Upstream patch:

> BUG: 1446227
> Signed-off-by: N Balachandran <nbalacha@redhat.com>
> Reviewed-on: https://review.gluster.org/17130
> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>

Change-Id: I0d6055488b51a13c91d2121e87f653cdb94888b0
BUG: 1447186
Signed-off-by: N Balachandran <nbalacha@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/105361
Reviewed-by: Milind Changire <mchangir@redhat.com>
Reviewed-by: Mohit Agrawal <moagrawa@redhat.com>
---
 xlators/cluster/dht/src/dht-common.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
index 5d9ab12..d54405b 100644
--- a/xlators/cluster/dht/src/dht-common.c
+++ b/xlators/cluster/dht/src/dht-common.c
@@ -8027,7 +8027,8 @@ dht_rmdir_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         prev  = cookie;
         src   = prev->this;
 
-gf_log ("dht", GF_LOG_INFO, "dht_rmdir_lookup_cbk %s", local->loc.path);
+        gf_msg_debug (this->name, 0, "dht_rmdir_lookup_cbk %s",
+                      local->loc.path);
 
         readdirp_frame = local->main_frame;
         readdirp_local = readdirp_frame->local;
@@ -8035,7 +8036,7 @@ gf_log ("dht", GF_LOG_INFO, "dht_rmdir_lookup_cbk %s", local->loc.path);
         if (op_ret != 0) {
 
                 gf_msg (this->name, GF_LOG_WARNING, op_errno,
-                        DHT_MSG_NOT_LINK_FILE_ERROR,
+                        DHT_MSG_FILE_LOOKUP_FAILED,
                         "lookup failed for %s on %s  (type=0%o)",
                         local->loc.path, src->name, stbuf->ia_type);
                 goto err;
@@ -8045,7 +8046,7 @@ gf_log ("dht", GF_LOG_INFO, "dht_rmdir_lookup_cbk %s", local->loc.path);
                 readdirp_local->op_ret  = -1;
                 readdirp_local->op_errno = ENOTEMPTY;
 
-                 gf_uuid_unparse(local->loc.gfid, gfid);
+                gf_uuid_unparse(local->loc.gfid, gfid);
 
                 gf_msg (this->name, GF_LOG_WARNING, 0,
                         DHT_MSG_NOT_LINK_FILE_ERROR,
@@ -8244,7 +8245,7 @@ dht_rmdir_is_subvol_empty (call_frame_t *frame, xlator_t *this,
 
                 gf_uuid_unparse(lookup_local->loc.gfid, gfid);
 
-                gf_msg_debug (this->name, 0,
+                gf_msg_trace (this->name, 0,
                               "looking up %s on subvolume %s, gfid = %s",
                               lookup_local->loc.path, src->name, gfid);
 
@@ -8266,7 +8267,7 @@ dht_rmdir_is_subvol_empty (call_frame_t *frame, xlator_t *this,
                                 lookup_local->loc.path, gfid);
 
                         gf_msg_debug (this->name, 0,
-                                     "looking up %s on subvolume %s, gfid = %s",
+                                      "looking up %s on subvol %s, gfid = %s",
                                       lookup_local->loc.path, src->name, gfid);
 
                         STACK_WIND (lookup_frame, dht_rmdir_lookup_cbk,
@@ -8408,9 +8409,6 @@ dht_rmdir_readdirp_do (call_frame_t *readdirp_frame, xlator_t *this)
                 return 0;
         }
 
-        gf_msg_debug ("this->name", 0, "Calling dht_rmdir_readdirp_do for %p",
-                      readdirp_frame);
-
         STACK_WIND (readdirp_frame, dht_rmdir_readdirp_cbk,
                     local->hashed_subvol,
                     local->hashed_subvol->fops->readdirp,
-- 
1.8.3.1