summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohit Agrawal <moagrawa@redhat.com>2016-06-24 09:58:29 +0530
committerJeff Darcy <jdarcy@redhat.com>2016-07-26 10:07:37 -0700
commitba91424a385e38b306c9189c84516e6c3db2135e (patch)
treeabc5625b681b75e0eee2dc74862d69459f3c6d63
parented1c986bff37e783a19fc43e38066a74ece13cc5 (diff)
rpc/socket.c : Modify socket_poller code in case of ENODATA error code.
Problem: Polling failure errors are coming till volume is not come while SSL is enabled. Solution: To avoid the message update one condition in socket_poller code It will not exit from thread in case of received ENODATA from ssl_do function. Backport of commit 84e9fc2fb5fabf9d1e553a420854a306cdb8a168 > Change-Id: Ia514e99b279b07b372ee950f4368ac0d9c702d82 > BUG: 1349709 > Signed-off-by: Mohit Agrawal <moagrawa@redhat.com> > Reviewed-on: http://review.gluster.org/14786 > Smoke: Gluster Build System <jenkins@build.gluster.org> > NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> > CentOS-regression: Gluster Build System <jenkins@build.gluster.org> > Reviewed-by: Jeff Darcy <jdarcy@redhat.com> > (cherry picked from commit 84e9fc2fb5fabf9d1e553a420854a306cdb8a168) BUG: 1359654 Signed-off-by: Mohit Agrawal <moagrawa@redhat.com> Change-Id: If1820c0b3d0cd976875137bc1175d4b2008779af Reviewed-on: http://review.gluster.org/14999 Tested-by: MOHIT AGRAWAL <moagrawa@redhat.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
-rw-r--r--rpc/rpc-transport/socket/src/socket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index a336751b589..af496ffc8e2 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -2505,7 +2505,7 @@ socket_poller (void *ctx)
"poll error on socket");
break;
}
- if (ret < 0) {
+ if (ret < 0 && errno != ENODATA) {
gf_log(this->name,GF_LOG_ERROR,
"error in polling loop");
break;