[PR #15717] [MERGED] fix: improve cleanup_response positioning for better resource management #39555

New Issue

GiteaMirror · 2026-04-25T12:06:39-05:00

GiteaMirror commented

2026-04-25 12:06:39 -05:00

📋 Pull Request Information

Original PR: https://github.com/open-webui/open-webui/pull/15717
Author: @sihyeonn
Created: 7/15/2025
Status: ✅ Merged
Merged: 7/15/2025
Merged by: @tjbck

Base: dev ← Head: fix/sh-cleanup

📝 Commits (2)

17f0bef refactor: use cleanup_response on openai
058369a fix: improve cleanup_response positioning for better resource management

📊 Changes

2 files changed (+9 additions, -13 deletions)

View changed files

📝 backend/open_webui/routers/ollama.py (+3 -1)
📝 backend/open_webui/routers/openai.py (+6 -12)

📄 Description

Pull Request Checklist

Note to first-time contributors: Please open a discussion post in Discussions and describe your changes before submitting a pull request.

Before submitting, make sure you've checked the following:

Target branch: Please verify that the pull request targets the dev branch.
Description: Provide a concise description of the changes made in this pull request.
Changelog: Ensure a changelog entry following the format of Keep a Changelog is added at the bottom of the PR description.
Documentation: Have you updated relevant documentation Open WebUI Docs, or other documentation sources?
Dependencies: Are there any new dependencies? Have you updated the dependency versions in the documentation?
Testing: Have you written and run sufficient tests to validate the changes?
Code review: Have you performed a self-review of your code, addressing any coding standard issues and ensuring adherence to the project's coding standards?
Prefix: To clearly categorize this pull request, prefix the pull request title using one of the following:
- BREAKING CHANGE: Significant changes that may affect compatibility
- build: Changes that affect the build system or external dependencies
- ci: Changes to our continuous integration processes or workflows
- chore: Refactor, cleanup, or other non-functional code changes
- docs: Documentation update or addition
- feat: Introduces a new feature or enhancement to the codebase
- fix: Bug fix or error correction
- i18n: Internationalization or localization changes
- perf: Performance improvement
- refactor: Code restructuring for better maintainability, readability, or scalability
- style: Changes that do not affect the meaning of the code (white space, formatting, missing semi-colons, etc.)
- test: Adding missing tests or correcting existing tests
- WIP: Work in progress, a temporary label for incomplete or ongoing work

Changelog Entry

Description

Repositioned cleanup_response function calls in send_post_request to ensure comprehensive resource cleanup across all execution paths, preventing memory leaks and connection pool exhaustion under various error conditions.

Added

Enhanced resource cleanup coverage for all exception scenarios
Improved connection pool management under high concurrent loads

Changed

Relocated cleanup_response calls to ensure consistent resource cleanup behavior
Optimized stream response resource management strategy
Reuse cleanup_response calls on openai

Fixed

Memory leaks when exceptions occur before cleanup in send_post_request
Inconsistent resource cleanup in error paths
Potential session leaks in edge cases during network timeouts
Connection pool exhaustion under high load scenarios
Resource cleanup dependency issues in stream responses

Security

Improved resource safety and stability by preventing resource leaks that could lead to service degradation

Additional Information

This change addresses internal resource management issues that could impact system stability under load
The fix ensures that aiohttp ClientSession and ClientResponse objects are properly cleaned up in all code paths
Testing covered scenarios include network timeouts, connection failures, server errors, stream interruptions, and high concurrent request loads
No API changes or user-facing functionality modifications

Screenshots or Videos

Not applicable for this internal resource management fix

Contributor License Agreement

By submitting this pull request, I confirm that I have read and fully agree to the Contributor License Agreement (CLA), and I am providing my contributions under its terms.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/open-webui/open-webui/pull/15717 **Author:** [@sihyeonn](https://github.com/sihyeonn) **Created:** 7/15/2025 **Status:** ✅ Merged **Merged:** 7/15/2025 **Merged by:** [@tjbck](https://github.com/tjbck) **Base:** `dev` ← **Head:** `fix/sh-cleanup` --- ### 📝 Commits (2) - [`17f0bef`](https://github.com/open-webui/open-webui/commit/17f0bef2e204072c07daacc5c63f7c2d6e357312) refactor: use cleanup_response on openai - [`058369a`](https://github.com/open-webui/open-webui/commit/058369adeaf6873801d89c6a30ca16da2a320e06) fix: improve cleanup_response positioning for better resource management ### 📊 Changes **2 files changed** (+9 additions, -13 deletions) <details> <summary>View changed files</summary> 📝 `backend/open_webui/routers/ollama.py` (+3 -1) 📝 `backend/open_webui/routers/openai.py` (+6 -12) </details> ### 📄 Description # Pull Request Checklist ### Note to first-time contributors: Please open a discussion post in [Discussions](https://github.com/open-webui/open-webui/discussions) and describe your changes before submitting a pull request. **Before submitting, make sure you've checked the following:** - [x] **Target branch:** Please verify that the pull request targets the `dev` branch. - [x] **Description:** Provide a concise description of the changes made in this pull request. - [x] **Changelog:** Ensure a changelog entry following the format of [Keep a Changelog](https://keepachangelog.com/) is added at the bottom of the PR description. - [x] **Documentation:** Have you updated relevant documentation [Open WebUI Docs](https://github.com/open-webui/docs), or other documentation sources? - [x] **Dependencies:** Are there any new dependencies? Have you updated the dependency versions in the documentation? - [x] **Testing:** Have you written and run sufficient tests to validate the changes? - [x] **Code review:** Have you performed a self-review of your code, addressing any coding standard issues and ensuring adherence to the project's coding standards? - [x] **Prefix:** To clearly categorize this pull request, prefix the pull request title using one of the following: - **BREAKING CHANGE**: Significant changes that may affect compatibility - **build**: Changes that affect the build system or external dependencies - **ci**: Changes to our continuous integration processes or workflows - **chore**: Refactor, cleanup, or other non-functional code changes - **docs**: Documentation update or addition - **feat**: Introduces a new feature or enhancement to the codebase - **fix**: Bug fix or error correction - **i18n**: Internationalization or localization changes - **perf**: Performance improvement - **refactor**: Code restructuring for better maintainability, readability, or scalability - **style**: Changes that do not affect the meaning of the code (white space, formatting, missing semi-colons, etc.) - **test**: Adding missing tests or correcting existing tests - **WIP**: Work in progress, a temporary label for incomplete or ongoing work # Changelog Entry ### Description - Repositioned `cleanup_response` function calls in `send_post_request` to ensure comprehensive resource cleanup across all execution paths, preventing memory leaks and connection pool exhaustion under various error conditions. ### Added - Enhanced resource cleanup coverage for all exception scenarios - Improved connection pool management under high concurrent loads ### Changed - Relocated `cleanup_response` calls to ensure consistent resource cleanup behavior - Optimized stream response resource management strategy - Reuse `cleanup_response` calls on openai ### Fixed - Memory leaks when exceptions occur before cleanup in `send_post_request` - Inconsistent resource cleanup in error paths - Potential session leaks in edge cases during network timeouts - Connection pool exhaustion under high load scenarios - Resource cleanup dependency issues in stream responses ### Security - Improved resource safety and stability by preventing resource leaks that could lead to service degradation --- ### Additional Information - This change addresses internal resource management issues that could impact system stability under load - The fix ensures that aiohttp ClientSession and ClientResponse objects are properly cleaned up in all code paths - Testing covered scenarios include network timeouts, connection failures, server errors, stream interruptions, and high concurrent request loads - No API changes or user-facing functionality modifications ### Screenshots or Videos - Not applicable for this internal resource management fix ### Contributor License Agreement By submitting this pull request, I confirm that I have read and fully agree to the [Contributor License Agreement (CLA)](/CONTRIBUTOR_LICENSE_AGREEMENT), and I am providing my contributions under its terms. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

GiteaMirror added the pull-request label 2026-04-25 12:06:39 -05:00

GiteaMirror closed this issue

2026-04-25 12:06:40 -05:00

Sign in to join this conversation.

Branches Tags

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/open-webui#39555