|
 |
21ab4e |
From d6b865ef3243798487f0036da282317af58aea1f Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: moagrawa <moagrawa@redhat.com>
|
|
|
21ab4e |
Date: Tue, 16 May 2017 07:32:57 +0530
|
|
|
21ab4e |
Subject: [PATCH 453/473] socket: Avoid flooding of error message in case of
|
|
|
21ab4e |
SSL
|
|
|
21ab4e |
|
|
|
21ab4e |
Problem: socket poller is throwing Input/Output messages during volume operation
|
|
|
21ab4e |
|
|
|
21ab4e |
Solution: Update the code in socket_connect function before call
|
|
|
21ab4e |
socket_spwan.
|
|
|
21ab4e |
|
|
|
21ab4e |
> BUG: 1450559
|
|
|
21ab4e |
> Change-Id: I5f275fe7a4b730b16d7b0a0407e76288b07ceaef
|
|
|
21ab4e |
> Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
|
|
|
21ab4e |
> Reviewed-on: https://review.gluster.org/17280
|
|
|
21ab4e |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> Reviewed-by: Zhou Zhengping <johnzzpcrystal@gmail.com>
|
|
|
21ab4e |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> Reviewed-by: Jeff Darcy <jeff@pl.atyp.us>
|
|
|
21ab4e |
> (cherry picked from commit 710cd0ae8f2dd0495ab483df050720b5c862688d)
|
|
|
21ab4e |
|
|
|
21ab4e |
BUG: 1427958
|
|
|
21ab4e |
Change-Id: Id8def150e2108043dc475856e47e9c560fc14975
|
|
|
21ab4e |
Signed-off-by: moagrawa <moagrawa@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/106256
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
rpc/rpc-transport/socket/src/socket.c | 11 ++++++++++-
|
|
|
21ab4e |
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
|
|
|
21ab4e |
index 07cf7a6..ffb56dd 100644
|
|
|
21ab4e |
--- a/rpc/rpc-transport/socket/src/socket.c
|
|
|
21ab4e |
+++ b/rpc/rpc-transport/socket/src/socket.c
|
|
|
21ab4e |
@@ -3282,7 +3282,16 @@ handler:
|
|
|
21ab4e |
rpc_transport_ref (this);
|
|
|
21ab4e |
refd = _gf_true;
|
|
|
21ab4e |
|
|
|
21ab4e |
- if (priv->own_thread && !(priv->connect_failed)) {
|
|
|
21ab4e |
+ if (priv->own_thread) {
|
|
|
21ab4e |
+ if (priv->connect_failed) {
|
|
|
21ab4e |
+ gf_msg_debug (this->name, 0,
|
|
|
21ab4e |
+ "socket connect is failed so close it");
|
|
|
21ab4e |
+ sys_close (priv->sock);
|
|
|
21ab4e |
+ priv->sock = -1;
|
|
|
21ab4e |
+ ret = -1;
|
|
|
21ab4e |
+ goto unlock;
|
|
|
21ab4e |
+ }
|
|
|
21ab4e |
+
|
|
|
21ab4e |
if (pipe(priv->pipe) < 0) {
|
|
|
21ab4e |
gf_log(this->name,GF_LOG_ERROR,
|
|
|
21ab4e |
"could not create pipe");
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|