This bug is to track the fix which was already in 3.1.2 but missed out as part of rebasing to 3.1.3 from upstream 3.7.9

Downstream patch : https://code.engineering.redhat.com/gerrit/#/c/70340/

Verified with RHGS 3.1.3 nightly build ( glusterfs-3.7.9-1.el7rhgs )

1. glusterd ping-timer is disabled
2. There is only one glusterd epoll thread

Here is the snip of glusterd volfile

<snip>
[root@ ~]# cat /etc/glusterfs/glusterd.vol 
volume management
    type mgmt/glusterd
    option working-directory /var/lib/glusterd
    option transport-type socket,rdma
    option transport.socket.keepalive-time 10
    option transport.socket.keepalive-interval 2
    option transport.socket.read-fail-log off
    option ping-timeout 0     <---- ping-timer disabled
    option event-threads 1    <---- only one glusterd epoll thread
#   option base-port 49152
end-volume
</snip>

Since the problem described in this bug report should be
resolved in a recent advisory, it has been closed with a
resolution of ERRATA.

For information on the advisory, and where to find the updated
files, follow the link below.

If the solution does not work for you, open a new bug report.

https://access.redhat.com/errata/RHBA-2016:1240