Skip to content

Commit

Permalink
Prevent double close in HTTP client __del__ (#468)
Browse files Browse the repository at this point in the history
Co-authored-by: Piotr Marcinkiewicz <[email protected]>
  • Loading branch information
debermudez and piotrm-nvidia committed Feb 27, 2024
1 parent 1dc9836 commit 665f359
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 2 deletions.
34 changes: 34 additions & 0 deletions src/c++/perf_analyzer/genai-pa/main.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/usr/bin/env python3
# Copyright 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# * Neither the name of NVIDIA CORPORATION nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


import argparse
import sys

args = parser.parse_args()
if __name__ == "__main__":
sys.exit(0)
7 changes: 5 additions & 2 deletions src/python/library/tritonclient/http/_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ def __init__(
)
self._pool = gevent.pool.Pool(max_greenlets)
self._verbose = verbose
self._closed = False

def __enter__(self):
return self
Expand All @@ -205,8 +206,10 @@ def close(self):
will result in an Error.
"""
self._pool.join()
self._client_stub.close()
if not self._closed:
self._pool.join()
self._client_stub.close()
self._closed = True

def _get(self, request_uri, headers, query_params):
"""Issues the GET request to the server
Expand Down

0 comments on commit 665f359

Please sign in to comment.