@@ -429,29 +429,29 @@ static int MtmConnectSocket(int node, int port)
429429snprintf (portstr ,sizeof (portstr ),"%d" ,port );
430430
431431rc = pg_getaddrinfo_all (host ,portstr ,& hint ,& addrs );
432- if (rc != 0 )
432+ if (rc != 0 )
433433{
434434MTM_ELOG (LOG ,"Arbiter failed to resolve host '%s' by name: %s" ,host ,gai_strerror (rc ));
435435return -1 ;
436436}
437437BIT_SET (busy_mask ,node );
438438
439- Retry :
439+ Retry :
440440
441- sd = socket (AF_INET ,SOCK_STREAM ,0 );
441+ sd = pg_socket (AF_INET ,SOCK_STREAM ,0 , MtmUseRDMA );
442442if (sd < 0 ) {
443443MTM_ELOG (LOG ,"Arbiter failed to create socket: %s" ,strerror (errno ));
444444gotoError ;
445445}
446- rc = fcntl (sd ,F_SETFL ,O_NONBLOCK );
446+ rc = pg_fcntl (sd ,F_SETFL ,O_NONBLOCK , MtmUseRDMA );
447447if (rc < 0 ) {
448448MTM_ELOG (LOG ,"Arbiter failed to switch socket to non-blocking mode: %s" ,strerror (errno ));
449449gotoError ;
450450}
451451for (addr = addrs ;addr != NULL ;addr = addr -> ai_next )
452452{
453453do {
454- rc = connect (sd ,addr -> ai_addr ,addr -> ai_addrlen );
454+ rc = pg_connect (sd ,addr -> ai_addr ,addr -> ai_addrlen , MtmUseRDMA );
455455}while (rc < 0 && errno == EINTR );
456456
457457if (rc >=0 || errno == EINPROGRESS ) {
@@ -491,12 +491,12 @@ static int MtmConnectSocket(int node, int port)
491491strcpy (req .connStr ,Mtm -> nodes [MtmNodeId - 1 ].con .connStr );
492492if (!MtmWriteSocket (sd ,& req ,sizeof req )) {
493493MTM_ELOG (WARNING ,"Arbiter failed to send handshake message to %s:%d: %s" ,host ,port ,strerror (errno ));
494- close (sd );
494+ pg_closesocket (sd , MtmUseRDMA );
495495gotoRetry ;
496496}
497497if (MtmReadSocket (sd ,& resp ,sizeof resp )!= sizeof (resp )) {
498498MTM_ELOG (WARNING ,"Arbiter failed to receive response for handshake message from %s:%d: %s" ,host ,port ,strerror (errno ));
499- close (sd );
499+ pg_closesocket (sd , MtmUseRDMA );
500500gotoRetry ;
501501}
502502if (resp .code != MSG_STATUS || resp .dxid != HANDSHAKE_MAGIC ) {
@@ -580,7 +580,7 @@ static bool MtmSendToNode(int node, void const* buf, int size)
580580if (sockets [node ]< 0 || !MtmWriteSocket (sockets [node ],buf ,size )) {
581581if (sockets [node ] >=0 ) {
582582MTM_ELOG (WARNING ,"Arbiter fail to write to node %d: %s" ,node + 1 ,strerror (errno ));
583- close (sockets [node ]);
583+ pg_closesocket (sockets [node ], MtmUseRDMA );
584584sockets [node ]= -1 ;
585585}
586586sockets [node ]= MtmConnectSocket (node ,Mtm -> nodes [node ].con .arbiterPort );
@@ -626,7 +626,7 @@ static void MtmAcceptOneConnection()
626626MTM_ELOG (WARNING ,"Arbiter failed to handshake socket: %s" ,strerror (errno ));
627627pg_closesocket (fd ,MtmUseRDMA );
628628}else if (req .hdr .code != MSG_HANDSHAKE && req .hdr .dxid != HANDSHAKE_MAGIC ) {
629- MTM_ELOG (WARNING ,"Arbiterget unexpected handshakemessage %d " ,req . hdr . code );
629+ MTM_ELOG (WARNING ,"Arbiterfailed to handshakesocket: %s " ,strerror ( errno ) );
630630pg_closesocket (fd ,MtmUseRDMA );
631631}else {
632632int node = req .hdr .node - 1 ;