[PR #22582] [CLOSED] fix: session cleanup lock #26766

Closed
opened 2026-04-20 06:41:57 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/open-webui/open-webui/pull/22582
Author: @Ithanil
Created: 3/11/2026
Status: Closed

Base: devHead: fix_session_cleanup


📝 Commits (2)

  • cd77a33 Fix session cleanup lock renewal cadence
  • 64fa17e reduce default WEBSOCKET_REDIS_LOCK_TIMEOUT to 15 seconds

📊 Changes

2 files changed (+15 additions, -3 deletions)

View changed files

📝 backend/open_webui/env.py (+2 -2)
📝 backend/open_webui/socket/main.py (+13 -1)

📄 Description

Pull Request Checklist

Note to first-time contributors: Please open a discussion post in Discussions to discuss your idea/fix with the community before creating a pull request, and describe your changes before submitting a pull request.

This is to ensure large feature PRs are discussed with the community first, before starting work on it. If the community does not want this feature or it is not relevant for Open WebUI as a project, it can be identified in the discussion before working on the feature and submitting the PR.

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

  • Target branch: Verify that the pull request targets the dev branch. PRs targeting main will be immediately closed.
  • Description: Provide a concise description of the changes made in this pull request down below.
  • Changelog: Ensure a changelog entry following the format of Keep a Changelog is added at the bottom of the PR description.
  • Documentation: Add docs in Open WebUI Docs Repository. Document user-facing behavior, environment variables, public APIs/interfaces, or deployment steps.
  • Dependencies: Are there any new or upgraded dependencies? If so, explain why, update the changelog/docs, and include any compatibility notes. Actually run the code/function that uses updated library to ensure it doesn't crash.
  • Testing: Perform manual tests to verify the implemented fix/feature works as intended AND does not break any other functionality. Include reproducible steps to demonstrate the issue before the fix. Test edge cases (URL encoding, HTML entities, types). Take this as an opportunity to make screenshots of the feature/fix and include them 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?
  • Design & Architecture: Prefer smart defaults over adding new settings; use local state for ephemeral UI logic. Open a Discussion for major architectural or UX changes.
  • Git Hygiene: Keep PRs atomic (one logical change). Clean up commits and rebase on dev to ensure no unrelated commits (e.g. from main) are included. Push updates to the existing PR branch instead of closing and reopening.
  • 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

  • Fix the session cleanup lock renewal cadence so the Redis lock stays alive throughout the full SESSION_POOL_TIMEOUT (120s) wait period. This prevents the session cleanup worker from dropping its lock and exiting early when WEBSOCKET_REDIS_LOCK_TIMEOUT is shorter than the session reap interval (which it was by default)
  • This also allows to drop the default WEBSOCKET_REDIS_LOCK_TIMEOUT to a much shorter value (I opted for 15s), reducing the long startup time of replicas since https://github.com/open-webui/open-webui/pull/15328

Changed

  • Updated the session cleanup loop in backend/open_webui/socket/main.py to split the SESSION_POOL_TIMEOUT sleep into smaller intervals based on WEBSOCKET_REDIS_LOCK_TIMEOUT / 2.
  • Reduced the default WEBSOCKET_REDIS_LOCK_TIMEOUT to 15 seconds.

Fixed

  • Fixed a bug where the session cleanup Redis lock would expire long before the next cleanup sweep, causing the cleanup worker to exit instead of continuing to reap orphaned sessions. This presented by 1) disappearance of the Redis key "open-webui:session_cleanup_lock" and then the log lines open_webui.socket.main:periodic_session_pool_cleanup:188 - Unable to renew session cleanup lock. Exiting. on the next cleanup iteration.
  • The fixed behavior makes smaller WEBSOCKET_REDIS_LOCK_TIMEOUT values compatible with the SESSION_POOL_TIMEOUT-based cleanup loop.

Contributor License Agreement

Note

Deleting the CLA section will lead to immediate closure of your PR and it will not be merged in.


🔄 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/22582 **Author:** [@Ithanil](https://github.com/Ithanil) **Created:** 3/11/2026 **Status:** ❌ Closed **Base:** `dev` ← **Head:** `fix_session_cleanup` --- ### 📝 Commits (2) - [`cd77a33`](https://github.com/open-webui/open-webui/commit/cd77a33ed6acc3ad8dfc56d85cf9330c772af1c7) Fix session cleanup lock renewal cadence - [`64fa17e`](https://github.com/open-webui/open-webui/commit/64fa17e0a20b3d18b4a2ec1a580bb4ded599f6f1) reduce default WEBSOCKET_REDIS_LOCK_TIMEOUT to 15 seconds ### 📊 Changes **2 files changed** (+15 additions, -3 deletions) <details> <summary>View changed files</summary> 📝 `backend/open_webui/env.py` (+2 -2) 📝 `backend/open_webui/socket/main.py` (+13 -1) </details> ### 📄 Description <!-- ⚠️ CRITICAL CHECKS FOR CONTRIBUTORS (READ, DON'T DELETE) ⚠️ 1. Target the `dev` branch. PRs targeting `main` will be automatically closed. 2. Do NOT delete the CLA section at the bottom. It is required for the bot to accept your PR. --> # Pull Request Checklist ### Note to first-time contributors: Please open a discussion post in [Discussions](https://github.com/open-webui/open-webui/discussions) to discuss your idea/fix with the community before creating a pull request, and describe your changes before submitting a pull request. This is to ensure large feature PRs are discussed with the community first, before starting work on it. If the community does not want this feature or it is not relevant for Open WebUI as a project, it can be identified in the discussion before working on the feature and submitting the PR. **Before submitting, make sure you've checked the following:** - [x] **Target branch:** Verify that the pull request targets the `dev` branch. **PRs targeting `main` will be immediately closed.** - [x] **Description:** Provide a concise description of the changes made in this pull request down below. - [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. - [ ] **Documentation:** Add docs in [Open WebUI Docs Repository](https://github.com/open-webui/docs). Document user-facing behavior, environment variables, public APIs/interfaces, or deployment steps. - [x] **Dependencies:** Are there any new or upgraded dependencies? If so, explain why, update the changelog/docs, and include any compatibility notes. Actually run the code/function that uses updated library to ensure it doesn't crash. - [x] **Testing:** Perform manual tests to **verify the implemented fix/feature works as intended AND does not break any other functionality**. Include reproducible steps to demonstrate the issue before the fix. Test edge cases (URL encoding, HTML entities, types). Take this as an opportunity to **make screenshots of the feature/fix and include them 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] **Design & Architecture:** Prefer smart defaults over adding new settings; use local state for ephemeral UI logic. Open a Discussion for major architectural or UX changes. - [x] **Git Hygiene:** Keep PRs atomic (one logical change). Clean up commits and rebase on `dev` to ensure no unrelated commits (e.g. from `main`) are included. Push updates to the existing PR branch instead of closing and reopening. - [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 - Fix the session cleanup lock renewal cadence so the Redis lock stays alive throughout the full `SESSION_POOL_TIMEOUT` (120s) wait period. This prevents the session cleanup worker from dropping its lock and exiting early when `WEBSOCKET_REDIS_LOCK_TIMEOUT` is shorter than the session reap interval (which it was by default) - This also allows to drop the default `WEBSOCKET_REDIS_LOCK_TIMEOUT` to a much shorter value (I opted for 15s), reducing the long startup time of replicas since https://github.com/open-webui/open-webui/pull/15328 ### Changed - Updated the session cleanup loop in `backend/open_webui/socket/main.py` to split the `SESSION_POOL_TIMEOUT` sleep into smaller intervals based on `WEBSOCKET_REDIS_LOCK_TIMEOUT / 2`. - Reduced the default `WEBSOCKET_REDIS_LOCK_TIMEOUT` to 15 seconds. ### Fixed - Fixed a bug where the session cleanup Redis lock would expire long before the next cleanup sweep, causing the cleanup worker to exit instead of continuing to reap orphaned sessions. This presented by 1) disappearance of the Redis key `"open-webui:session_cleanup_lock"` and then the log lines `open_webui.socket.main:periodic_session_pool_cleanup:188 - Unable to renew session cleanup lock. Exiting.` on the next cleanup iteration. - The fixed behavior makes smaller `WEBSOCKET_REDIS_LOCK_TIMEOUT` values compatible with the `SESSION_POOL_TIMEOUT`-based cleanup loop. ### Contributor License Agreement <!-- 🚨 DO NOT DELETE THE TEXT BELOW 🚨 Keep the "Contributor License Agreement" confirmation text intact. Deleting it will trigger the CLA-Bot to INVALIDATE your PR. Your PR will NOT be reviewed or merged until you check the box below confirming that you have read and agree to the terms of the CLA. --> - [ ] 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. > [!NOTE] > Deleting the CLA section will lead to immediate closure of your PR and it will not be merged in. --- <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-20 06:41:57 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/open-webui#26766