diff options
| author | Mohit Agrawal <moagrawa@redhat.com> | 2016-06-24 09:58:29 +0530 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-07-26 10:07:28 -0700 |
| commit | 279abb3a5e33a0b4876af89695c3d7316eea93ce (patch) | |
| tree | 936c6b693e27935340ecd594587f10b0455c5fdc | |
| parent | a0f66d107a29e2db5bdd96dec4bc112330b5f5aa (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: 1359651
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
Change-Id: I86aa9955eca13d23120ba17b787f619c7de6be0c
Reviewed-on: http://review.gluster.org/14998
Tested-by: MOHIT AGRAWAL <moagrawa@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Prashanth Pai <ppai@redhat.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
| -rw-r--r-- | rpc/rpc-transport/socket/src/socket.c | 2 |
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 298e5348098..0baca25a635 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; |