|
 |
21ab4e |
From e7eb1f1ac0e4bf197c2fa7af030583cc9c93a11c Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: N Balachandran <nbalacha@redhat.com>
|
|
|
21ab4e |
Date: Fri, 28 Apr 2017 11:32:48 +0530
|
|
|
21ab4e |
Subject: [PATCH 408/426] cluster/dht Remove redundant logs in dht rmdir
|
|
|
3604df |
|
|
|
3604df |
Removing redundant logs were introduced in
|
|
|
3604df |
https://review.gluster.org/#/c/17065/
|
|
|
3604df |
|
|
|
3604df |
> BUG: 1446227
|
|
|
3604df |
> Signed-off-by: N Balachandran <nbalacha@redhat.com>
|
|
|
3604df |
> Reviewed-on: https://review.gluster.org/17130
|
|
|
21ab4e |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
|
|
|
3604df |
|
|
|
3604df |
Change-Id: I0d6055488b51a13c91d2121e87f653cdb94888b0
|
|
|
21ab4e |
BUG: 1445195
|
|
|
3604df |
Signed-off-by: N Balachandran <nbalacha@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/104671
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
---
|
|
|
21ab4e |
xlators/cluster/dht/src/dht-common.c | 15 +++++++--------
|
|
|
21ab4e |
1 file changed, 7 insertions(+), 8 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
|
|
|
21ab4e |
index f9a5729..81afabe 100644
|
|
|
3604df |
--- a/xlators/cluster/dht/src/dht-common.c
|
|
|
3604df |
+++ b/xlators/cluster/dht/src/dht-common.c
|
|
|
21ab4e |
@@ -8259,14 +8259,16 @@ dht_rmdir_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
|
|
|
3604df |
prev = cookie;
|
|
|
21ab4e |
src = prev;
|
|
|
3604df |
|
|
|
3604df |
-gf_log ("dht", GF_LOG_INFO, "dht_rmdir_lookup_cbk %s", local->loc.path);
|
|
|
3604df |
+ gf_msg_debug (this->name, 0, "dht_rmdir_lookup_cbk %s",
|
|
|
3604df |
+ local->loc.path);
|
|
|
21ab4e |
+
|
|
|
3604df |
readdirp_frame = local->main_frame;
|
|
|
3604df |
readdirp_local = readdirp_frame->local;
|
|
|
21ab4e |
|
|
|
3604df |
if (op_ret != 0) {
|
|
|
3604df |
|
|
|
3604df |
gf_msg (this->name, GF_LOG_WARNING, op_errno,
|
|
|
3604df |
- DHT_MSG_NOT_LINK_FILE_ERROR,
|
|
|
3604df |
+ DHT_MSG_FILE_LOOKUP_FAILED,
|
|
|
3604df |
"lookup failed for %s on %s (type=0%o)",
|
|
|
3604df |
local->loc.path, src->name, stbuf->ia_type);
|
|
|
3604df |
goto err;
|
|
|
21ab4e |
@@ -8475,7 +8477,7 @@ dht_rmdir_is_subvol_empty (call_frame_t *frame, xlator_t *this,
|
|
|
3604df |
|
|
|
3604df |
gf_uuid_unparse(lookup_local->loc.gfid, gfid);
|
|
|
3604df |
|
|
|
3604df |
- gf_msg_debug (this->name, 0,
|
|
|
3604df |
+ gf_msg_trace (this->name, 0,
|
|
|
3604df |
"looking up %s on subvolume %s, gfid = %s",
|
|
|
3604df |
lookup_local->loc.path, src->name, gfid);
|
|
|
3604df |
|
|
|
21ab4e |
@@ -8497,7 +8499,7 @@ dht_rmdir_is_subvol_empty (call_frame_t *frame, xlator_t *this,
|
|
|
3604df |
lookup_local->loc.path, gfid);
|
|
|
3604df |
|
|
|
3604df |
gf_msg_debug (this->name, 0,
|
|
|
3604df |
- "looking up %s on subvolume %s, gfid = %s",
|
|
|
3604df |
+ "looking up %s on subvol %s, gfid = %s",
|
|
|
3604df |
lookup_local->loc.path, src->name, gfid);
|
|
|
3604df |
|
|
|
21ab4e |
STACK_WIND_COOKIE (lookup_frame, dht_rmdir_lookup_cbk,
|
|
|
21ab4e |
@@ -8506,7 +8508,7 @@ dht_rmdir_is_subvol_empty (call_frame_t *frame, xlator_t *this,
|
|
|
21ab4e |
} else {
|
|
|
21ab4e |
gf_msg_debug (this->name, 0,
|
|
|
21ab4e |
"Looking up linkfile target %s on "
|
|
|
21ab4e |
- " subvolume %s, gfid = %s",
|
|
|
21ab4e |
+ " subvol %s, gfid = %s",
|
|
|
21ab4e |
lookup_local->loc.path, subvol->name,
|
|
|
21ab4e |
gfid);
|
|
|
21ab4e |
|
|
|
21ab4e |
@@ -8639,9 +8641,6 @@ dht_rmdir_readdirp_do (call_frame_t *readdirp_frame, xlator_t *this)
|
|
|
3604df |
return 0;
|
|
|
3604df |
}
|
|
|
3604df |
|
|
|
3604df |
- gf_msg_debug ("this->name", 0, "Calling dht_rmdir_readdirp_do for %p",
|
|
|
3604df |
- readdirp_frame);
|
|
|
3604df |
-
|
|
|
21ab4e |
STACK_WIND_COOKIE (readdirp_frame, dht_rmdir_readdirp_cbk,
|
|
|
21ab4e |
local->hashed_subvol,
|
|
|
21ab4e |
local->hashed_subvol,
|
|
|
3604df |
--
|
|
|
3604df |
1.8.3.1
|
|
|
3604df |
|