Skip to content

Commit

Permalink
Cleanup fallback server error logging, remove outdated logs on port c…
Browse files Browse the repository at this point in the history
…onflicts
  • Loading branch information
rmccorm4 committed Jan 10, 2024
1 parent 7bef17e commit 390f481
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 12 deletions.
28 changes: 20 additions & 8 deletions src/triton_cli/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def wait_for_ready(timeout, server, client):
# Server health will throw exception if error occurs on server side
server.health()
time.sleep(1)
raise Exception(
raise TimeoutError(
f"Timed out waiting {timeout} seconds for server to startup. Try increasing --server-timeout."
)

Expand Down Expand Up @@ -273,16 +273,25 @@ def start_server_with_fallback(args: argparse.Namespace, blocking=True):
logger.debug(f"No --mode specified, trying the following modes: {modes}")

server = None
errors = []
for mode in modes:
try:
args.mode = mode
server = start_server(args, blocking=blocking)
except Exception as e:
logger.debug(f"Failed to start server in '{mode}' mode. Error: {e}")
msg = f"Failed to start server in '{mode}' mode. {e}"
logger.debug(msg)
errors.append(msg)
continue

if not server:
raise Exception("Failed to start server.")
# Give nicely formatted errors for each case.
if len(errors) > 1:
raise Exception(f"Failed to start server. Errors: {errors}")
elif len(errors) == 1:
raise Exception(f"{errors[0]}")
else:
raise Exception("Failed to start server, unknown error.")

return server

Expand Down Expand Up @@ -461,6 +470,7 @@ def handle_bench(args: argparse.Namespace):
verbose=args.verbose,
)

server = None
try:
### Start server
server = start_server_with_fallback(args, blocking=False)
Expand All @@ -472,12 +482,14 @@ def handle_bench(args: argparse.Namespace):
profile_model(args, client)
except KeyboardInterrupt:
print()
except Exception as ex:
# Catch timeout exception
logger.error(ex)
except TimeoutError as e:
logger.error(e)
except Exception as e:
logger.error(f"Unexpected error: {e}")

logger.info("Stopping server...")
server.stop()
if server:
logger.info("Stopping server...")
server.stop()


def parse_args_bench(subcommands):
Expand Down
5 changes: 1 addition & 4 deletions src/triton_cli/server/server_docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,7 @@ def start(self, env=None):
raise Exception(
"One of the following port(s) are already allocated: "
f"{server_http_port}, {server_grpc_port}, "
f"{server_metrics_port}.\n"
"Change the Triton server ports using"
" --triton-http-endpoint, --triton-grpc-endpoint,"
" and --triton-metrics-endpoint flags."
f"{server_metrics_port}."
)
else:
raise Exception(e)
Expand Down

0 comments on commit 390f481

Please sign in to comment.