summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
Diffstat (limited to 'xlators')
-rw-r--r--xlators/protocol/client/src/client3_1-fops.c54
-rw-r--r--xlators/protocol/server/src/server3_1-fops.c10
2 files changed, 42 insertions, 22 deletions
diff --git a/xlators/protocol/client/src/client3_1-fops.c b/xlators/protocol/client/src/client3_1-fops.c
index 3289da369ce..13b577a57f4 100644
--- a/xlators/protocol/client/src/client3_1-fops.c
+++ b/xlators/protocol/client/src/client3_1-fops.c
@@ -189,9 +189,11 @@ client3_1_symlink_cbk (struct rpc_req *req, struct iovec *iov, int count,
out:
if (rsp.op_ret == -1) {
gf_log (this->name, GF_LOG_WARNING,
- "remote operation failed: %s. Path: %s",
+ "remote operation failed: %s. Path: %s (%s)",
strerror (gf_error_to_errno (rsp.op_errno)),
- (local) ? local->loc.path : "--");
+ (local) ? local->loc.path : "--",
+ (local && local->loc.inode) ?
+ uuid_utoa (local->loc.inode->gfid) : "--");
}
CLIENT_STACK_UNWIND (symlink, frame, rsp.op_ret,
@@ -258,9 +260,11 @@ client3_1_mknod_cbk (struct rpc_req *req, struct iovec *iov, int count,
out:
if (rsp.op_ret == -1) {
gf_log (this->name, GF_LOG_WARNING,
- "remote operation failed: %s. Path: %s",
+ "remote operation failed: %s. Path: %s (%s)",
strerror (gf_error_to_errno (rsp.op_errno)),
- (local) ? local->loc.path : "--");
+ (local) ? local->loc.path : "--",
+ (local && local->loc.inode) ?
+ uuid_utoa (local->loc.inode->gfid) : "--");
}
CLIENT_STACK_UNWIND (mknod, frame, rsp.op_ret,
@@ -325,9 +329,11 @@ client3_1_mkdir_cbk (struct rpc_req *req, struct iovec *iov, int count,
out:
if (rsp.op_ret == -1) {
gf_log (this->name, GF_LOG_WARNING,
- "remote operation failed: %s. Path: %s",
+ "remote operation failed: %s. Path: %s (%s)",
strerror (gf_error_to_errno (rsp.op_errno)),
- (local) ? local->loc.path : "--");
+ (local) ? local->loc.path : "--",
+ (local && local->loc.inode) ?
+ uuid_utoa (local->loc.inode->gfid) : "--");
}
CLIENT_STACK_UNWIND (mkdir, frame, rsp.op_ret,
@@ -414,9 +420,11 @@ client3_1_open_cbk (struct rpc_req *req, struct iovec *iov, int count,
out:
if (rsp.op_ret == -1) {
gf_log (this->name, GF_LOG_WARNING,
- "remote operation failed: %s. Path: %s",
+ "remote operation failed: %s. Path: %s (%s)",
strerror (gf_error_to_errno (rsp.op_errno)),
- (local) ? local->loc.path : "--");
+ (local) ? local->loc.path : "--",
+ (local && local->loc.inode) ?
+ uuid_utoa (local->loc.inode->gfid) : "--");
}
CLIENT_STACK_UNWIND (open, frame, rsp.op_ret,
@@ -1052,9 +1060,11 @@ out:
if (rsp.op_ret == -1) {
gf_log (this->name, ((op_errno == ENOTSUP) ?
GF_LOG_DEBUG : GF_LOG_WARNING),
- "remote operation failed: %s. Path: %s",
+ "remote operation failed: %s. Path: %s (%s)",
strerror (op_errno),
- (local) ? local->loc.path : "--");
+ (local) ? local->loc.path : "--",
+ (local && local->loc.inode) ?
+ uuid_utoa (local->loc.inode->gfid) : "--");
}
CLIENT_STACK_UNWIND (getxattr, frame, rsp.op_ret, op_errno, dict, xdata);
@@ -1703,9 +1713,11 @@ client3_1_xattrop_cbk (struct rpc_req *req, struct iovec *iov, int count,
out:
if (rsp.op_ret == -1) {
gf_log (this->name, GF_LOG_WARNING,
- "remote operation failed: %s. Path: %s",
+ "remote operation failed: %s. Path: %s (%s)",
strerror (gf_error_to_errno (rsp.op_errno)),
- (local) ? local->loc.path : "--");
+ (local) ? local->loc.path : "--",
+ (local && local->loc.inode) ?
+ uuid_utoa (local->loc.inode->gfid) : "--");
}
CLIENT_STACK_UNWIND (xattrop, frame, rsp.op_ret,
@@ -2041,9 +2053,11 @@ client3_1_create_cbk (struct rpc_req *req, struct iovec *iov, int count,
out:
if (rsp.op_ret == -1) {
gf_log (this->name, GF_LOG_WARNING,
- "remote operation failed: %s. Path: %s",
+ "remote operation failed: %s. Path: %s (%s)",
strerror (gf_error_to_errno (rsp.op_errno)),
- (local) ? local->loc.path : "--");
+ (local) ? local->loc.path : "--",
+ (local && local->loc.inode) ?
+ uuid_utoa (local->loc.inode->gfid) : "--");
}
CLIENT_STACK_UNWIND (create, frame, rsp.op_ret,
@@ -2533,9 +2547,11 @@ client3_1_opendir_cbk (struct rpc_req *req, struct iovec *iov, int count,
out:
if (rsp.op_ret == -1) {
gf_log (this->name, GF_LOG_WARNING,
- "remote operation failed: %s. Path: %s",
+ "remote operation failed: %s. Path: %s (%s)",
strerror (gf_error_to_errno (rsp.op_errno)),
- (local) ? local->loc.path : "--");
+ (local) ? local->loc.path : "--",
+ (local && local->loc.inode) ?
+ uuid_utoa (local->loc.inode->gfid) : "--");
}
CLIENT_STACK_UNWIND (opendir, frame, rsp.op_ret,
gf_error_to_errno (rsp.op_errno), fd, xdata);
@@ -2615,9 +2631,11 @@ out:
/* any error other than ENOENT */
if (rsp.op_errno != ENOENT)
gf_log (this->name, GF_LOG_WARNING,
- "remote operation failed: %s. Path: %s",
+ "remote operation failed: %s. Path: %s (%s)",
strerror (rsp.op_errno),
- (local) ? local->loc.path : "--");
+ (local) ? local->loc.path : "--",
+ (local && local->loc.inode) ?
+ uuid_utoa (local->loc.inode->gfid) : "--");
else
gf_log (this->name, GF_LOG_TRACE, "not found on remote node");
diff --git a/xlators/protocol/server/src/server3_1-fops.c b/xlators/protocol/server/src/server3_1-fops.c
index 10dddd79b16..c652dd5b3e2 100644
--- a/xlators/protocol/server/src/server3_1-fops.c
+++ b/xlators/protocol/server/src/server3_1-fops.c
@@ -523,9 +523,10 @@ server_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
inode_unref (link_inode);
} else {
gf_log (this->name, GF_LOG_INFO,
- "%"PRId64": MKDIR %s ==> %"PRId32" (%s)",
+ "%"PRId64": MKDIR %s (%s) ==> %"PRId32" (%s)",
frame->root->unique, state->loc.path,
- op_ret, strerror (op_errno));
+ state->loc.inode ? uuid_utoa (state->loc.inode->gfid) :
+ "--",op_ret, strerror (op_errno));
}
GF_PROTOCOL_DICT_SERIALIZE (this, xdata, (&rsp.xdata.xdata_val),
@@ -569,9 +570,10 @@ server_mknod_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
inode_unref (link_inode);
} else {
gf_log (this->name, GF_LOG_INFO,
- "%"PRId64": MKNOD %s ==> %"PRId32" (%s)",
+ "%"PRId64": MKNOD %s (%s) ==> %"PRId32" (%s)",
frame->root->unique, state->loc.path,
- op_ret, strerror (op_errno));
+ state->loc.inode ? uuid_utoa (state->loc.inode->gfid) :
+ "--",op_ret, strerror (op_errno));
}
GF_PROTOCOL_DICT_SERIALIZE (this, xdata, (&rsp.xdata.xdata_val),
generated by cgit (git 2.34.1) at 2024-11-20 03:39:55 +0000