Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the Synapse Worker configuration with new base image name and worker configuration #105

Merged
merged 6 commits into from
May 21, 2021

Conversation

anoadragon453
Copy link
Member

This PR updates Complement's Synapse worker-flavoured docker image in a few ways:

  • Updates the base image name from synapse:workers to synapse-workers, as it's built from a separate Dockerfile from the base matrixdotorg/synapse image.
  • Update the SYNAPSE_WORKERS env var name to SYNAPSE_WORKER_TYPES
  • Switches to an explicit list of worker names. We dropped the * functionality after adding sharding capabilities. The worker configuration mirrors that of sytest.

These changes grew out of this PR on Synapse which changed the base image.

I'd ideally like feedback from the Synapse team on the chosen worker configuration.

We've removed '*' as it stopped making sense after we started allowing
multiple instances of the same worker to be specified.

This list of workers is ripped from SyTest.
@anoadragon453 anoadragon453 requested review from kegsay and a team April 23, 2021 18:07
Copy link
Member

@erikjohnston erikjohnston left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this broadly matches current sytest config

@anoadragon453
Copy link
Member Author

After looking at the diff again, I don't think this really needs a review from a Complement perspective...

@anoadragon453 anoadragon453 removed the request for review from kegsay April 26, 2021 16:12
@kegsay
Copy link
Member

kegsay commented May 14, 2021

@anoadragon453 is this ready to merge?

@anoadragon453
Copy link
Member Author

Yes apologies for the delay. I just wanted to test the whole thing end-to-end before merging but got hung up on the /proc/1/cpuset bug.

I don't think these changes are going to be modified any further however, so we can merge this bit.

@anoadragon453 anoadragon453 merged commit 04a2e63 into master May 21, 2021
@anoadragon453 anoadragon453 deleted the anoa/synapse_worker_types branch May 21, 2021 13:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants