Reserve any ready job, even in the safety margin.

conn.c

@@ -239,6 +239,17 @@ conn_has_close_deadline(conn c)
  return j && t >= j->deadline - SAFETY_MARGIN;
 }
 
+int
+conn_ready(conn c)
+{
+ size_t i;
+
+ for (i = 0; i < c->watch.used; i++) {
+ if (((tube) c->watch.items[i])->ready.used) return 1;
+ }
+ return 0;
+}
+
 void
 conn_close(conn c)
 {

conn.h

@@ -108,5 +108,6 @@ void conn_set_worker(conn c);
 job soonest_job(conn c);
 int has_reserved_this_job(conn c, job j);
 int conn_has_close_deadline(conn c);
+int conn_ready(conn c);
 
 #endif /*conn_h*/

doc/protocol.txt

@@ -201,8 +201,8 @@ the job times out, when the server will put the job back into the ready queue.
 The time available can be found by asking the server for the job's stats.
 
 If the client has previously reserved job J and issues a reserve command when
-J has less than one second left in its ttr interval, the server will respond
-with:
+J has less than one second left in its ttr interval and there are no ready
+jobs, the server will respond with:
 
 TIMEOUT\r\n
 

prot.c

@@ -1074,7 +1074,9 @@ dispatch_cmd(conn c)
  reserve_ct++; /* stats */
  conn_set_worker(c);
 
- if (conn_has_close_deadline(c)) return reply_msg(c, MSG_TIMEOUT);
+ if (conn_has_close_deadline(c) && !conn_ready(c)) {
+ return reply_msg(c, MSG_TIMEOUT);
+ }
 
  /* try to get a new job for this guy */
  wait_for_job(c);