From 6df94e06cc4dcb60756ac49bd751c4cf95999703 Mon Sep 17 00:00:00 2001 From: Milind Changire Date: Sun, 5 Mar 2017 21:39:20 +0530 Subject: rpc: avoid logging success on failure Avoid logging Success in the event of failure especially when errno has no meaningful value w.r.t. the failure. In this case the errno is set to zero when there's indeed a failure at the RPC level. mainline: > BUG: 1426032 > Signed-off-by: Milind Changire > Reviewed-on: https://review.gluster.org/16730 > Smoke: Gluster Build System > NetBSD-regression: NetBSD Build System > CentOS-regression: Gluster Build System > Reviewed-by: N Balachandran > Reviewed-by: Jeff Darcy (cherry picked from commit 89c6bedc1c2e978f67ca29f212a357984cd8a2dd) Change-Id: If2cc81aa1e590023ed22892dacbef7cac213e591 BUG: 1451995 Signed-off-by: Milind Changire Reviewed-on: https://review.gluster.org/17326 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Raghavendra Talur --- api/src/glfs-mgmt.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'api') diff --git a/api/src/glfs-mgmt.c b/api/src/glfs-mgmt.c index 045080d667a..6b65e517a67 100644 --- a/api/src/glfs-mgmt.c +++ b/api/src/glfs-mgmt.c @@ -792,11 +792,16 @@ mgmt_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event, switch (event) { case RPC_CLNT_DISCONNECT: if (!ctx->active) { - gf_msg ("glfs-mgmt", GF_LOG_ERROR, errno, - API_MSG_REMOTE_HOST_CONN_FAILED, - "failed to connect with remote-host: %s (%s)", - ctx->cmd_args.volfile_server, - strerror (errno)); + if (rpc_trans->connect_failed) + gf_msg ("glfs-mgmt", GF_LOG_ERROR, 0, + API_MSG_REMOTE_HOST_CONN_FAILED, + "failed to connect to remote-host: %s", + ctx->cmd_args.volfile_server); + else + gf_msg ("glfs-mgmt", GF_LOG_INFO, 0, + API_MSG_REMOTE_HOST_CONN_FAILED, + "disconnected from remote-host: %s", + ctx->cmd_args.volfile_server); if (!rpc->disabled) { /* -- cgit