mirror of
https://git.datalinker.icu/vllm-project/vllm.git
synced 2025-12-12 02:35:52 +08:00
Revert "[Misc] Add S3 environment variables for better support of MinIO." (#17021)
This commit is contained in:
parent
7e081ba7ca
commit
6bc1e30ef9
@ -45,12 +45,7 @@ def glob(s3=None,
|
|||||||
list[str]: List of full S3 paths allowed by the pattern
|
list[str]: List of full S3 paths allowed by the pattern
|
||||||
"""
|
"""
|
||||||
if s3 is None:
|
if s3 is None:
|
||||||
s3 = boto3.client(
|
s3 = boto3.client("s3")
|
||||||
's3',
|
|
||||||
aws_access_key_id=os.getenv("AWS_ACCESS_KEY_ID"),
|
|
||||||
aws_secret_access_key=os.getenv("AWS_SECRET_ACCESS_KEY"),
|
|
||||||
endpoint_url=os.getenv("AWS_ENDPOINT_URL"),
|
|
||||||
region_name=os.getenv("AWS_REGION_NAME"))
|
|
||||||
if not path.endswith("/"):
|
if not path.endswith("/"):
|
||||||
path = path + "/"
|
path = path + "/"
|
||||||
bucket_name, _, paths = list_files(s3,
|
bucket_name, _, paths = list_files(s3,
|
||||||
@ -112,12 +107,7 @@ class S3Model:
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
self.s3 = boto3.client(
|
self.s3 = boto3.client('s3')
|
||||||
's3',
|
|
||||||
aws_access_key_id=os.getenv("AWS_ACCESS_KEY_ID"),
|
|
||||||
aws_secret_access_key=os.getenv("AWS_SECRET_ACCESS_KEY"),
|
|
||||||
endpoint_url=os.getenv("AWS_ENDPOINT_URL"),
|
|
||||||
region_name=os.getenv("AWS_REGION_NAME"))
|
|
||||||
for sig in (signal.SIGINT, signal.SIGTERM):
|
for sig in (signal.SIGINT, signal.SIGTERM):
|
||||||
existing_handler = signal.getsignal(sig)
|
existing_handler = signal.getsignal(sig)
|
||||||
signal.signal(sig, self._close_by_signal(existing_handler))
|
signal.signal(sig, self._close_by_signal(existing_handler))
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user