From a65a482dc2f09de3e1115c593864248522eea29e Mon Sep 17 00:00:00 2001 From: Krishnan Parthasarathi Date: Fri, 11 Jan 2013 14:53:50 +0530 Subject: socket: Don't log readv failures if read-fail-log is false Change-Id: I6903d62cbc7107eb8498bcd81d07667b36890a02 BUG: 764888 Signed-off-by: Krishnan Parthasarathi Reviewed-on: http://review.gluster.org/4377 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- rpc/rpc-transport/socket/src/socket.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index ae574f5f5..830aece05 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -148,10 +148,12 @@ typedef int SSL_trinary_func (SSL *, void *, int); &in->pending_count, \ &bytes_read); \ if (ret == -1) { \ - gf_log (this->name, GF_LOG_WARNING, \ - "reading from socket failed. Error (%s), " \ - "peer (%s)", strerror (errno), \ - this->peerinfo.identifier); \ + if (priv->read_fail_log) \ + gf_log (this->name, GF_LOG_WARNING, \ + "reading from socket failed." \ + "Error (%s), peer (%s)", \ + strerror (errno), \ + this->peerinfo.identifier); \ break; \ } \ __socket_proto_update_priv_after_read (priv, ret, bytes_read); \ @@ -496,9 +498,11 @@ __socket_rwv (rpc_transport_t *this, struct iovec *vector, int count, if (errno == EINTR) continue; - gf_log (this->name, GF_LOG_WARNING, - "%s failed (%s)", write ? "writev" : "readv", - strerror (errno)); + if (write || (!write && priv->read_fail_log)) + gf_log (this->name, GF_LOG_WARNING, + "%s failed (%s)", + write ? "writev":"readv", + strerror (errno)); if (priv->use_ssl) { ssl_dump_error_stack(this->name); } -- cgit