aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/core
diff options
context:
space:
mode:
authorGravatar David Garcia Quintas <dgq@google.com>2015-10-05 16:24:18 -0700
committerGravatar David Garcia Quintas <dgq@google.com>2015-10-05 16:24:18 -0700
commit6a739c715321c7249ce17b3ff3fbd6594c10af2f (patch)
tree069822e02bf4dfed492bbb345e8b7bf24029b384 /test/core
parentf747bbc04327c9ef02690cd7466ec6786967c4fe (diff)
parentd48c5a5b9feb9cfacde4741e92d6dfcdae632416 (diff)
Merge branch 'master' of github.com:grpc/grpc into cq_alarm
Diffstat (limited to 'test/core')
-rw-r--r--test/core/util/port_posix.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c
index 887079e0f8..0a50660586 100644
--- a/test/core/util/port_posix.c
+++ b/test/core/util/port_posix.c
@@ -213,15 +213,25 @@ static void got_port_from_server(grpc_exec_ctx *exec_ctx, void *arg,
size_t i;
int port = 0;
portreq *pr = arg;
+ int failed = 0;
+
+ if (!response) {
+ failed = 1;
+ gpr_log(GPR_DEBUG,
+ "failed port pick from server: retrying [response=NULL]");
+ } else if (response->status != 200) {
+ failed = 1;
+ gpr_log(GPR_DEBUG, "failed port pick from server: status=%d",
+ response->status);
+ }
- if (!response || response->status != 200) {
+ if (failed) {
grpc_httpcli_request req;
memset(&req, 0, sizeof(req));
GPR_ASSERT(pr->retries < 10);
pr->retries++;
req.host = pr->server;
req.path = "/get";
- gpr_log(GPR_DEBUG, "failed port pick from server: retrying");
sleep(1);
grpc_httpcli_get(exec_ctx, pr->ctx, &pr->pollset, &req,
GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10), got_port_from_server,