[PR #18537] [MERGED] fix: prevent cancellation scope corruption by exitting in LIFO and ha… #47875

New Issue

GiteaMirror · 2026-04-29T23:16:56-05:00

GiteaMirror commented

2026-04-29 23:16:56 -05:00

📋 Pull Request Information

Original PR: https://github.com/open-webui/open-webui/pull/18537
Author: @OAburub
Created: 10/23/2025
Status: ✅ Merged
Merged: 10/26/2025
Merged by: @tjbck

Base: dev ← Head: patch

📝 Commits (1)

8f060ee fix: prevent cancellation scope corruption by exitting in LIFO and handling exceptions

📊 Changes

2 files changed (+29 additions, -22 deletions)

View changed files

📝 backend/open_webui/main.py (+5 -3)
📝 backend/open_webui/utils/mcp/client.py (+24 -19)

📄 Description

…ndling exceptions

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: Verify that the pull request targets the dev branch. Not targeting the dev branch may lead to immediate closure of the PR.
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: If necessary, update relevant documentation Open WebUI Docs like environment variables, the tutorials, or other documentation sources.
Dependencies: Are there any new dependencies? Have you updated the dependency versions in the documentation?
Testing: Perform manual tests to verify the implemented fix/feature works as intended AND does not break any other functionality. Take this as an opportunity to make screenshots of the feature/fix and include it in the PR description.
Agentic AI Code:: Confirm this Pull Request is not written by any AI Agent or has at least gone through additional human review and manual testing. If any AI Agent is the co-author of this PR, it may lead to immediate closure of the PR.
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?
Title 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

Reversed MCP server disconnection order so that it follows LIFO
Fixed an issue where if an error occurs during the connection to an MCP it causes Cancel Scope corruption leading to 100% CPU percentage.

Fixed

Reversed MCP server disconnection order so that it follows LIFO
Fixed an issue where if an error occurs during the connection to an MCP it causes Cancel Scope corruption leading to 100% CPU percentage.

Additional Information

Fixes issues #18311 and [GH-ISSUE #17576] issue: Open-web UI does not support openrouter preset, with the ability to leverage a single modell, and obtain openrouter diagnostics (#18333)
A similar Issue was being had in https://github.com/pydantic/pydantic-ai/issues/2201 and was fixed in a similar manner

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/18537 **Author:** [@OAburub](https://github.com/OAburub) **Created:** 10/23/2025 **Status:** ✅ Merged **Merged:** 10/26/2025 **Merged by:** [@tjbck](https://github.com/tjbck) **Base:** `dev` ← **Head:** `patch` --- ### 📝 Commits (1) - [`8f060ee`](https://github.com/open-webui/open-webui/commit/8f060ee2fa24173f98297632c1d8dc3059628cc1) fix: prevent cancellation scope corruption by exitting in LIFO and handling exceptions ### 📊 Changes **2 files changed** (+29 additions, -22 deletions) <details> <summary>View changed files</summary> 📝 `backend/open_webui/main.py` (+5 -3) 📝 `backend/open_webui/utils/mcp/client.py` (+24 -19) </details> ### 📄 Description …ndling exceptions # 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:** Verify that the pull request targets the `dev` branch. Not targeting the `dev` branch may lead to immediate closure of the PR. - [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:** If necessary, update relevant documentation [Open WebUI Docs](https://github.com/open-webui/docs) like environment variables, the tutorials, or other documentation sources. - [x] **Dependencies:** Are there any new dependencies? Have you updated the dependency versions in the documentation? - [x] **Testing:** Perform manual tests to verify the implemented fix/feature works as intended AND does not break any other functionality. Take this as an opportunity to make screenshots of the feature/fix and include it in the PR description. - [x] **Agentic AI Code:**: Confirm this Pull Request is **not written by any AI Agent** or has at least gone through additional human review **and** manual testing. If any AI Agent is the co-author of this PR, it may lead to immediate closure of the PR. - [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] **Title 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 - Reversed MCP server disconnection order so that it follows LIFO - Fixed an issue where if an error occurs during the connection to an MCP it causes Cancel Scope corruption leading to 100% CPU percentage. ### Fixed - Reversed MCP server disconnection order so that it follows LIFO - Fixed an issue where if an error occurs during the connection to an MCP it causes Cancel Scope corruption leading to 100% CPU percentage. ### Additional Information - Fixes issues #18311 and #18333 - A similar Issue was being had in https://github.com/pydantic/pydantic-ai/issues/2201 and was fixed in a similar manner ### Contributor License Agreement By submitting this pull request, I confirm that I have read and fully agree to the [Contributor License Agreement (CLA)](https://github.com/open-webui/open-webui/blob/main/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-29 23:16:56 -05:00

GiteaMirror closed this issue

2026-04-29 23:16:58 -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#47875