Skip to content

Commit

Permalink
Add more verbose traces for port_server usage
Browse files Browse the repository at this point in the history
  • Loading branch information
ctiller committed Oct 5, 2015
1 parent 3bf828f commit 0d6499e
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 5 deletions.
14 changes: 12 additions & 2 deletions test/core/util/port_posix.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 7 additions & 3 deletions tools/run_tests/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -715,17 +715,21 @@ def _start_port_server(port_server_port):
try:
version = urllib2.urlopen('http:https://localhost:%d/version' % port_server_port,
timeout=1).read()
print 'detected port server running'
running = True
except Exception:
print 'failed to detect port server: %s' % sys.exc_info()[0]
running = False
if running:
with open('tools/run_tests/port_server.py') as f:
current_version = hashlib.sha1(f.read()).hexdigest()
running = (version == current_version)
if not running:
print 'port_server version mismatch: killing the old one'
urllib2.urlopen('http:https://localhost:%d/quit' % port_server_port).read()
time.sleep(1)
if not running:
print 'starting port_server'
port_log = open('portlog.txt', 'w')
port_server = subprocess.Popen(
['python', 'tools/run_tests/port_server.py', '-p', '%d' % port_server_port],
Expand All @@ -737,7 +741,7 @@ def _start_port_server(port_server_port):
if waits > 10:
port_server.kill()
if port_server.poll() is not None:
print "port_server failed to start"
print 'port_server failed to start'
port_log = open('portlog.txt', 'r').read()
print port_log
sys.exit(1)
Expand All @@ -746,11 +750,11 @@ def _start_port_server(port_server_port):
timeout=1).read()
break
except socket.timeout:
print "waiting for port_server"
print 'waiting for port_server: timeout'
time.sleep(0.5)
waits += 1
except urllib2.URLError:
print "waiting for port_server"
print 'waiting for port_server: urlerror'
time.sleep(0.5)
waits += 1
except:
Expand Down

0 comments on commit 0d6499e

Please sign in to comment.