@@ -222,18 +222,18 @@ static void MtmDisconnect(int node)
222222MtmOnNodeDisconnect (node + 1 );
223223}
224224
225- static int MtmWaitWriteSocket (int sd ,time_t timeoutMsec )
225+ static int MtmWaitSocket (int sd , bool forWrite ,time_t timeoutMsec )
226226{
227227struct timeval tv ;
228- fd_set out_set ;
228+ fd_set set ;
229229int rc ;
230230tv .tv_sec = timeoutMsec /1000 ;
231231tv .tv_usec = timeoutMsec %1000 * 1000 ;
232- FD_ZERO (& out_set );
233- FD_SET (sd ,& out_set );
232+ FD_ZERO (& set );
233+ FD_SET (sd ,& set );
234234do {
235235MtmCheckHeartbeat ();
236- }while ((rc = select (sd + 1 ,NULL , & out_set ,NULL ,& tv ))< 0 && errno == EINTR );
236+ }while ((rc = select (sd + 1 ,forWrite ? NULL : & set , forWrite ? & set : NULL ,NULL ,& tv ))< 0 && errno == EINTR );
237237return rc ;
238238}
239239
@@ -242,7 +242,7 @@ static bool MtmWriteSocket(int sd, void const* buf, int size)
242242char * src = (char * )buf ;
243243busy_socket = sd ;
244244while (size != 0 ) {
245- int rc = MtmWaitWriteSocket (sd ,MtmHeartbeatSendTimeout );
245+ int rc = MtmWaitSocket (sd , true ,MtmHeartbeatSendTimeout );
246246if (rc == 1 ) {
247247int n = send (sd ,src ,size ,0 );
248248if (n < 0 ) {
@@ -401,7 +401,7 @@ static int MtmConnectSocket(char const* host, int port, int max_attempts)
401401busy_socket = -1 ;
402402return -1 ;
403403}else {
404- rc = MtmWaitWriteSocket (sd ,MtmConnectTimeout );
404+ rc = MtmWaitSocket (sd , true ,MtmConnectTimeout );
405405if (rc == 1 ) {
406406socklen_t optlen = sizeof (int );
407407if (getsockopt (sd ,SOL_SOCKET ,SO_ERROR , (void * )& rc ,& optlen )< 0 ) {
@@ -434,7 +434,7 @@ static int MtmConnectSocket(char const* host, int port, int max_attempts)
434434close (sd );
435435gotoRetry ;
436436}
437- if (MtmReadSocket (sd ,& resp ,sizeof resp )!= sizeof (resp )) {
437+ if (MtmWaitSocket ( sd , false, MtmHeartbeatSendTimeout ) != 1 || MtmReadSocket (sd ,& resp ,sizeof resp )!= sizeof (resp )) {
438438elog (WARNING ,"Arbiter failed to receive response for handshake message from %s:%d: errno=%d" ,host ,port ,errno );
439439close (sd );
440440gotoRetry ;