diff options
| author | Venkatesh Somyajulu <vsomyaju@redhat.com> | 2013-03-18 17:13:51 +0530 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-03-18 21:30:49 -0700 |
| commit | 1cc57ff832cc48634cd697b828551f4cc3ee42b8 (patch) | |
| tree | 77c0ef4a0b4d232922002f57e616f04080fc80b4 /rpc/rpc-transport | |
| parent | 1975c5416402f3a64d5359e50a2c48b44f100d16 (diff) | |
rpc: For AF_UNIX sockets, do not set keepalive option.
Change-Id: I65df52e89fe7783ff00c2b7a49be571d15e8f0d0
BUG: 920009
Signed-off-by: Venkatesh Somyajulu <vsomyaju@redhat.com>
Reviewed-on: http://review.gluster.org/4684
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'rpc/rpc-transport')
| -rw-r--r-- | rpc/rpc-transport/socket/src/socket.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index fffc137f665..526732b0af7 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -2456,7 +2456,8 @@ socket_server_event_handler (int fd, int idx, void *data, } } - if (priv->keepalive) { + if (priv->keepalive && + new_sockaddr.ss_family != AF_UNIX) { ret = __socket_keepalive (new_sock, new_sockaddr.ss_family, priv->keepaliveintvl, @@ -2725,7 +2726,7 @@ socket_connect (rpc_transport_t *this, int port) } } - if (priv->keepalive) { + if (priv->keepalive && sa_family != AF_UNIX) { ret = __socket_keepalive (priv->sock, sa_family, priv->keepaliveintvl, |