summaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorShyam <srangana@redhat.com>2015-02-23 10:00:39 -0500
committerRaghavendra G <rgowdapp@redhat.com>2015-03-01 22:50:07 -0800
commitc48cbccfafbcf71aaad4ed7d868dbac609bc34fe (patch)
treeb563a62dc508808fe761dcc4df32aa2af43b9148 /rpc
parent56488efe3c858da7f8a0b66d30a2eface2f6f35e (diff)
epoll: Fix broken RPC throttling due to MT epoll
The RPC throttle which kicks in by setting the poll-in event on a socket to false, is broken with the MT epoll commit. This is due to the event handler of poll-in attempting to read as much out of the socket till it receives an EAGAIN. Which may never happen and hence we would be processing far more RPCs that we want to. This is being fixed by changing the epoll from ET to LT, and reading request by request, so that we honor the throttle. The downside is that we do not drain the socket, but go back to epoll_wait before reading the next request, but when kicking in throttle, we need to anyway and so a busy connection would degrade to LT anyway to maintain the throttle. As a result this change should not cause deviation in the performance much for busy connections. Change-Id: I522d284d2d0f40e1812ab4c1a453c8aec666464c BUG: 1192114 Signed-off-by: Shyam <srangana@redhat.com> Reviewed-on: http://review.gluster.org/9726 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com> Tested-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'rpc')
-rw-r--r--rpc/rpc-transport/socket/src/socket.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index a7e2bb0cfdf..2b61eb417d2 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -2263,16 +2263,9 @@ socket_event_poll_in (rpc_transport_t *this)
rpc_transport_pollin_t *pollin = NULL;
socket_private_t *priv = this->private;
- do {
- /* consume all we can, this is our only chance
- (Edge Triggered polling in epoll)
- */
- pollin = NULL;
- ret = socket_proto_state_machine (this, &pollin);
-
- if (!pollin)
- break;
+ ret = socket_proto_state_machine (this, &pollin);
+ if (pollin) {
priv->ot_state = OT_CALLBACK;
ret = rpc_transport_notify (this, RPC_TRANSPORT_MSG_RECEIVED,
pollin);
@@ -2280,8 +2273,7 @@ socket_event_poll_in (rpc_transport_t *this)
priv->ot_state = OT_RUNNING;
}
rpc_transport_pollin_destroy (pollin);
-
- } while (pollin);
+ }
return ret;
}