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,