Treat a -1 response from cluster_check_response as a timeout.

michael-grunder · michael-grunder · commit 27df92208a6a · 2018-10-14T11:50:47.000-07:00
When cluster_check_response returns -1 this can be treated as a timeout. Note that there is one non-timout condition which can cause a -1 response, but that is a corrupted MOVE/ASK reply which can *probably* be treated as a timeout as well, because it means that something has gone horribly wrong with the connection. Addresses #1425
diff --git a/cluster_library.c b/cluster_library.c
@@ -1439,8 +1439,9 @@ PHP_REDIS_API short cluster_send_command(redisCluster *c, short slot, const char
            }
         }
 
-        /* Figure out if we've timed out trying to read or write the data */
-        timedout = resp && c->waitms ? mstime() - msstart >= c->waitms : 0;
+        /* We're timed out if cluster_check_response returned -1, or if the
+         * response was non-zero and we've been in the loop too long */
+        timedout = resp == -1 || (resp && c->waitms ? mstime() - msstart >= c->waitms : 0);
     } while (resp != 0 && !c->clusterdown && !timedout);
 
     // If we've detected the cluster is down, throw an exception

Original file line number	Diff line number	Diff line change
`@@ -1439,8 +1439,9 @@ PHP_REDIS_API short cluster_send_command(redisCluster *c, short slot, const char`
`1439`	`1439`	`}`
`1440`	`1440`	`}`
`1441`	`1441`
`1442`		`- /* Figure out if we've timed out trying to read or write the data */`
`1443`		`- timedout = resp && c->waitms ? mstime() - msstart >= c->waitms : 0;`
	`1442`	`+ /* We're timed out if cluster_check_response returned -1, or if the`
	`1443`	`+ * response was non-zero and we've been in the loop too long */`
	`1444`	`+ timedout = resp == -1 \|\| (resp && c->waitms ? mstime() - msstart >= c->waitms : 0);`
`1444`	`1445`	`} while (resp != 0 && !c->clusterdown && !timedout);`
`1445`	`1446`
`1446`	`1447`	`// If we've detected the cluster is down, throw an exception`