|
 |
3604df |
From 3854e0d8e5f603e75767d79ea0495cea1974c693 Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: moagrawa <moagrawa@redhat.com>
|
|
|
3604df |
Date: Mon, 7 Nov 2016 10:24:16 +0530
|
|
|
3604df |
Subject: [PATCH 147/157] rpc/socket.c : Modify socket_poller code in case of ENODATA error code.
|
|
|
3604df |
Problem: Continuous warning message(ENODATA) are coming in socket_rwv
|
|
|
3604df |
while SSL is enabled.
|
|
|
3604df |
Solution: To avoid the warning message update one condition in
|
|
|
3604df |
socket_poller loop code before break from loop in case of
|
|
|
3604df |
error returned by poll functions.
|
|
|
3604df |
> BUG: 1386450
|
|
|
3604df |
> Change-Id: I19b3a92d4c3ba380738379f5679c1c354f0ab9b1
|
|
|
3604df |
> Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
|
|
|
3604df |
> Reviewed-on: http://review.gluster.org/15677
|
|
|
3604df |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
|
|
|
3604df |
> (cherry picked from commit ec64ce2e1684003f4e7a20d4372e414bfbddb6fb)
|
|
|
3604df |
|
|
|
3604df |
BUG: 1385525
|
|
|
3604df |
Change-Id: Id6161bdc30a0d979479776a8524851f5cbf99f09
|
|
|
3604df |
Signed-off-by: moagrawa <moagrawa@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/89220
|
|
|
3604df |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
rpc/rpc-transport/socket/src/socket.c | 2 +-
|
|
|
3604df |
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
|
|
|
3604df |
index 4244883..ae551dc 100644
|
|
|
3604df |
--- a/rpc/rpc-transport/socket/src/socket.c
|
|
|
3604df |
+++ b/rpc/rpc-transport/socket/src/socket.c
|
|
|
3604df |
@@ -2544,7 +2544,7 @@ socket_poller (void *ctx)
|
|
|
3604df |
"poll error on socket");
|
|
|
3604df |
break;
|
|
|
3604df |
}
|
|
|
3604df |
- if (ret < 0 && errno != ENODATA) {
|
|
|
3604df |
+ if (ret < 0) {
|
|
|
3604df |
GF_LOG_OCCASIONALLY (poll_err_cnt, this->name,
|
|
|
3604df |
GF_LOG_ERROR,
|
|
|
3604df |
"socket_poller %s failed (%s)",
|
|
|
3604df |
--
|
|
|
3604df |
1.7.1
|
|
|
3604df |
|