Skip to content

1.164.0 - #67

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

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

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 17:18
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 rebase dropped the Beeper cap of 2 concurrent scheduled tasks. Upstream 1.164 reads max_concurrent_tasks from config (default 5), and the stack config doesn't set it, so workers will run 5 purges/deletes at once instead of 2.
    Found by Indent Review Agent

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

CI Checks

All CI checks passed on ca66c06.

Review agents

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

Found issues (1)
  • Indent Review Agent · Rebase raised task concurrency from 2 to 5
Full results

Indent Review Agent

  • Summary: Rebase raised task concurrency from 2 to 5
  • Last ran on commit: ca66c064
  • Latest result
    {
      "summary": "Rebase raised task concurrency from 2 to 5",
      "findings": [
        {
          "fix": "Restore the cap. Either add `task_scheduler: {max_concurrent_tasks: 2}` to the stack homeserver config before rolling out 1.164.0, or keep it in the fork by changing `DEFAULT_MAX_CONCURRENT_TASKS` in synapse/config/task_scheduler.py to 2, marked with a `# Beep:` comment so it survives future rebases.",
          "line": 106,
          "path": "synapse/util/task_scheduler.py",
          "issue": "Still present at ca66c064. The Beeper commit \"Temporarily reduce scheduled task load\" used to set `MAX_CONCURRENT_RUNNING_TASKS = 2`. Upstream 1.164 changed the scheduler so the limit comes from `hs.config.task_scheduler.max_concurrent_tasks` (default 5), which it keeps in `self._max_concurrent_tasks` and checks in `_launch_scheduled_tasks` and `_launch_task`. While resolving the conflict, the `= 2` override was dropped and only the `SLEEP_AFTER_TASK_S` throttle was kept (compare the 1.160 commit 647e3b11a with de0fa56ee). The production homeserver template in beeper/stack (`kustomizations/synapse-components/workers-synapse/files/homeserver.j2.yaml`) has no `task_scheduler:` section, so after deploy each worker will run up to 5 scheduled tasks at once instead of 2. That means 2.5x the concurrent room purges and deletes, which is the load this patch was added to prevent.",
          "title": "Rebase silently dropped the Beeper task concurrency cap (2 → 5)",
          "severity": "bug"
        }
      ]
    }

@indent
indent Bot force-pushed the beeper-1.164.0 branch from 25af20a to ca66c06 Compare October 28, 2026 17:00
@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