@@ -125,7 +125,8 @@ static bool timed_write(int sock, void *data, size_t len, int timeout_ms)
125125if (newbytes == -1 )
126126{
127127if (errno == EAGAIN ) {
128- if (poll_until_writable (sock ,timeout_ms - msec (now - start ))) {
128+ int remaining_ms = (timeout_ms == -1 ) ?-1 :timeout_ms - msec (now - start );
129+ if (poll_until_writable (sock ,remaining_ms )) {
129130continue ;
130131}
131132}
@@ -157,7 +158,8 @@ static bool timed_read(int sock, void *data, size_t len, int timeout_ms)
157158if (newbytes == -1 )
158159{
159160if (errno == EAGAIN ) {
160- if (poll_until_readable (sock ,timeout_ms - msec (now - start ))) {
161+ int remaining_ms = (timeout_ms == -1 ) ?-1 :timeout_ms - msec (now - start );
162+ if (poll_until_readable (sock ,remaining_ms )) {
161163continue ;
162164}
163165}
@@ -224,8 +226,9 @@ static bool connect_leader(int timeout_ms)
224226while ((elapsed_ms <=timeout_ms )|| (timeout_ms == -1 ))
225227{
226228TimestampTz past = now ;
229+ int remaining_ms = (timeout_ms == -1 ) ?-1 :timeout_ms - elapsed_ms ;
227230
228- if (poll_until_writable (sd ,timeout_ms - elapsed_ms ))
231+ if (poll_until_writable (sd ,remaining_ms ))
229232{
230233int err ;
231234socklen_t optlen = sizeof (err );
@@ -301,7 +304,7 @@ raftable_sql_get(PG_FUNCTION_ARGS)
301304
302305static bool try_sending_update (RaftableUpdate * ru ,size_t size ,int timeout_ms )
303306{
304- int s ,status ;
307+ int s ,status , remaining_ms ;
305308TimestampTz start ,now ;
306309
307310now = start = GetCurrentTimestamp ();
@@ -310,45 +313,49 @@ static bool try_sending_update(RaftableUpdate *ru, size_t size, int timeout_ms)
310313if (s < 0 )return false;
311314
312315now = GetCurrentTimestamp ();
316+ remaining_ms = (timeout_ms == -1 ) ?-1 :timeout_ms - msec (now - start );
313317if ((timeout_ms != -1 )&& (msec (now - start )> timeout_ms ))
314318{
315319elog (WARNING ,"update: connect() timed out" );
316320return false;
317321}
318322
319- if (!timed_write (s ,& size ,sizeof (size ),timeout_ms - msec ( now - start ) ))
323+ if (!timed_write (s ,& size ,sizeof (size ),remaining_ms ))
320324{
321325elog (WARNING ,"failed to send the update size to the leader" );
322326return false;
323327}
324328
325329now = GetCurrentTimestamp ();
330+ remaining_ms = (timeout_ms == -1 ) ?-1 :timeout_ms - msec (now - start );
326331if ((timeout_ms != -1 )&& (msec (now - start )> timeout_ms ))
327332{
328333elog (WARNING ,"update: send(size) timed out" );
329334return false;
330335}
331336
332- if (!timed_write (s ,ru ,size ,timeout_ms - msec ( now - start ) ))
337+ if (!timed_write (s ,ru ,size ,remaining_ms ))
333338{
334339elog (WARNING ,"failed to send the update to the leader" );
335340return false;
336341}
337342
338343now = GetCurrentTimestamp ();
344+ remaining_ms = (timeout_ms == -1 ) ?-1 :timeout_ms - msec (now - start );
339345if ((timeout_ms != -1 )&& (msec (now - start )> timeout_ms ))
340346{
341347elog (WARNING ,"update: send(body) timed out" );
342348return false;
343349}
344350
345- if (!timed_read (s ,& status ,sizeof (status ),timeout_ms - msec ( now - start ) ))
351+ if (!timed_read (s ,& status ,sizeof (status ),remaining_ms ))
346352{
347353elog (WARNING ,"failed to recv the update status from the leader" );
348354return false;
349355}
350356
351357now = GetCurrentTimestamp ();
358+ remaining_ms = (timeout_ms == -1 ) ?-1 :timeout_ms - msec (now - start );
352359if ((timeout_ms != -1 )&& (msec (now - start )> timeout_ms ))
353360{
354361elog (WARNING ,"update: recv(status) timed out" );
@@ -396,7 +403,8 @@ bool raftable_set(const char *key, const char *value, size_t vallen, int timeout
396403while ((elapsed_ms <=timeout_ms )|| (timeout_ms == -1 ))
397404{
398405TimestampTz past = now ;
399- if (try_sending_update (ru ,size ,timeout_ms - elapsed_ms ))
406+ int remaining_ms = (timeout_ms == -1 ) ?-1 :timeout_ms - elapsed_ms ;
407+ if (try_sending_update (ru ,size ,remaining_ms ))
400408{
401409pfree (ru );
402410return true;