Skip to content

1.164.1 - #68

Closed
tulir wants to merge 46 commits into
upstream-1.164.1from
beeper-1.164.1
Closed

tulir wants to merge 46 commits into
upstream-1.164.1from
beeper-1.164.1

Conversation

@tulir

@tulir tulir commented Oct 28, 2026

Copy link
Copy Markdown
Member

No description provided.

Fizzadar and others added 30 commits October 28, 2026 20:11
Annoying! Will lave that to upstream and we'll get updates as we rebase.
Signed-off-by: Sumner Evans <sumner.evans@automattic.com>
@indent

indent Bot commented Oct 28, 2026 •

Copy link
Copy Markdown

Issues

1 potential issue found:

  • The Beeper cap of 2 concurrent scheduled tasks was lost in the rebase. Upstream now takes the cap from task_scheduler.max_concurrent_tasks (default 5), so workers run 5 tasks at once unless it is set to 2 in config.
    Found by Indent Review Agent

↑ Select any checkbox above to have Indent auto-fix the issue

CI Checks

All CI checks passed on 4171726.

Review agents

Select any unchecked box below to run or rerun that agent.

Found issues (1)
  • Indent Review Agent · Task concurrency cap of 2 lost in rebase
Full results

Indent Review Agent

  • Summary: Task concurrency cap of 2 lost in rebase
  • Last ran on commit: 41717268
  • Latest result
    {
      "summary": "Task concurrency cap of 2 lost in rebase",
      "findings": [
        {
          "fix": "Either set `DEFAULT_MAX_CONCURRENT_TASKS = 2` (with a `# Beep` comment) in synapse/config/task_scheduler.py, keeping `TaskScheduler.DEFAULT_MAX_CONCURRENT_RUNNING_TASKS` in sync, or add `task_scheduler: {max_concurrent_tasks: 2}` to the production homeserver template in beeper/stack before rolling out.",
          "line": 106,
          "path": "synapse/util/task_scheduler.py",
          "issue": "On beeper-1.160.0 the commit \"Temporarily reduce scheduled task load\" set `MAX_CONCURRENT_RUNNING_TASKS = 2  # Beep: temporarily changed from 5`. Upstream has since made this configurable as `task_scheduler.max_concurrent_tasks` (default 5, synapse/config/task_scheduler.py:21), and `_max_concurrent_tasks` now comes from that config. During conflict resolution the commit (cc8c3c7a7) kept only the 1s post-task sleep and dropped the cap. beeper/stack's synapse homeserver config doesn't set `task_scheduler.max_concurrent_tasks` anywhere, so once this is deployed every worker will run up to 5 scheduled tasks at a time (room purges/shutdowns, device deletions, etc.) instead of 2. That brings back the load the throttle was added to prevent. This was already the case in beeper-1.164.0 and carries forward unchanged.",
          "title": "Beeper task concurrency cap of 2 lost in rebase; scheduler now runs 5 tasks at once",
          "severity": "bug"
        }
      ]
    }

@tulir tulir closed this Oct 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

7 participants