From 80da8d75218552f2f78c37369a295be151cdc1f8 Mon Sep 17 00:00:00 2001 From: Saravanakumar Arumugam Date: Thu, 28 May 2015 11:54:04 +0530 Subject: [PATCH 60/73] geo-rep: ignore symlink and harlink errors in geo-rep Ignore logging in case of symlink and hardlink creation errors, as these are safe errors with respect to geo-replication. Change-Id: I3b863fb03ae23dbea907e4dd9477ff85feecad70 BUG: 1224662 Reviewed-On: http://review.gluster.org/10957 Reviewed-On: http://review.gluster.org/10984 Signed-off-by: Saravanakumar Arumugam Reviewed-on: https://code.engineering.redhat.com/gerrit/50523 Reviewed-by: Aravinda Vishwanathapura Krishna Murthy Tested-by: Aravinda Vishwanathapura Krishna Murthy --- xlators/protocol/client/src/client-rpc-fops.c | 26 ++++++++++++++---------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/xlators/protocol/client/src/client-rpc-fops.c b/xlators/protocol/client/src/client-rpc-fops.c index e5912bd..e8e3cdf 100644 --- a/xlators/protocol/client/src/client-rpc-fops.c +++ b/xlators/protocol/client/src/client-rpc-fops.c @@ -163,13 +163,15 @@ client3_3_symlink_cbk (struct rpc_req *req, struct iovec *iov, int count, out: if (rsp.op_ret == -1) { - /* no need to print the gfid, because it will be null, since - * symlink operation failed. - */ - gf_log (this->name, GF_LOG_WARNING, - "remote operation failed: %s. Path: (%s to %s)", - strerror (gf_error_to_errno (rsp.op_errno)), - local->loc.path, local->loc2.path); + if (GF_IGNORE_IF_GSYNCD_SAFE_ERROR(frame, rsp.op_errno)) { + /* no need to print the gfid, because it will be null, + * since symlink operation failed. + */ + gf_log (this->name, GF_LOG_WARNING, + "remote operation failed: %s. Path: (%s to %s)", + strerror (gf_error_to_errno (rsp.op_errno)), + local->loc.path, local->loc2.path); + } } CLIENT_STACK_UNWIND (symlink, frame, rsp.op_ret, @@ -2668,10 +2670,12 @@ client3_3_link_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 (%s -> %s)", - strerror (gf_error_to_errno (rsp.op_errno)), - local->loc.path, local->loc2.path); + if (GF_IGNORE_IF_GSYNCD_SAFE_ERROR(frame, rsp.op_errno)) { + gf_log (this->name, GF_LOG_WARNING, + "remote operation failed: %s (%s -> %s)", + strerror (gf_error_to_errno (rsp.op_errno)), + local->loc.path, local->loc2.path); + } } CLIENT_STACK_UNWIND (link, frame, rsp.op_ret, -- 1.7.1