diff --git a/apps/worker/video_processing/oss_helpers.py b/apps/worker/video_processing/oss_helpers.py index 96bf9973f..05a58685a 100755 --- a/apps/worker/video_processing/oss_helpers.py +++ b/apps/worker/video_processing/oss_helpers.py @@ -22,7 +22,7 @@ logger = logging.getLogger(__name__) # OSS 上传配置 OSS_CONNECT_TIMEOUT = 10 # 连接超时(秒),防止 TCP 握手挂死 -OSS_UPLOAD_TOTAL_TIMEOUT = 300 # 单文件上传总超时(秒),防止网络慢时无限卡住 +OSS_UPLOAD_TOTAL_TIMEOUT = 900 # 单文件上传总超时(秒),防止网络慢时无限卡住 OSS_MULTIPART_THRESHOLD = 100 * 1024 * 1024 # 分片上传阈值:100MB 以上走分片 OSS_PART_SIZE = 8 * 1024 * 1024 # 分片大小:8MB OSS_MULTIPART_NUM_THREADS = 3 # 分片上传并发数 @@ -127,10 +127,10 @@ def download_asset(asset_storage_key: str, local_path: Path) -> bool: def _download_via_http(url: str, local_path: Path) -> bool: """通过 HTTP 下载文件(支持预签名 URL)。 - 使用流式下载避免大文件内存溢出,超时 300s。 + 使用流式下载避免大文件内存溢出,超时 900s。 """ try: - resp = requests.get(url, stream=True, timeout=300) + resp = requests.get(url, stream=True, timeout=900) resp.raise_for_status() with open(local_path, "wb") as f: for chunk in resp.iter_content(chunk_size=8 * 1024 * 1024): @@ -146,7 +146,7 @@ def upload_to_oss(local_path: Path | str, storage_key: str) -> str | None: """上传文件到 OSS,返回公开 URL。 大文件(>100MB)自动走分片上传,降低内存峰值,减少 OOM 风险。 - 上传加总超时保护(默认 300s),防止网络异常时无限挂死。 + 上传加总超时保护(默认 900s),防止网络异常时无限挂死。 Args: local_path: 本地文件路径(Path 或 str 均可)