Limit concurrency per-organization

readthedocs/builds/querysets.py

@@ -134,6 +134,11 @@ def concurrent(self, project):
 
         - translation: concurrent builds of all the translations + builds of main project
 
+        .. note::
+
+          If the project/translation belongs to an organization, we count all concurrent
+          builds for all the projects from the organization.
+
         :rtype: tuple
         :returns: limit_reached, number of concurrent builds, number of max concurrent
         """
@@ -149,12 +154,22 @@ def concurrent(self, project):
             # The project has translations, counts their builds as well
             query |= Q(project__in=project.translations.all())
 
+        # If the project belongs to an organization, count all the projects
+        # from this organization as well
+        organization = project.organizations.first()
+        if organization:
+            query |= Q(project__in=organization.projects.all())
+
         concurrent = (
             self.filter(query)
             .exclude(state__in=[BUILD_STATE_TRIGGERED, BUILD_STATE_FINISHED])
-        ).count()
+        ).distinct().count()
 
-        max_concurrent = project.max_concurrent_builds or settings.RTD_MAX_CONCURRENT_BUILDS
+        max_concurrent = (
+            project.max_concurrent_builds or
+            (organization.max_concurrent_builds if organization else 0) or
+            settings.RTD_MAX_CONCURRENT_BUILDS
+        )
         log.info(
             'Concurrent builds. project=%s running=%s max=%s',
             project.slug,

readthedocs/builds/tests/test_build_queryset.py

@@ -5,6 +5,7 @@
 
 from readthedocs.builds.querysets import BuildQuerySet
 from readthedocs.builds.models import Build, Version
+from readthedocs.organizations.models import Organization
 from readthedocs.projects.models import Project, Feature
 
 
@@ -73,3 +74,88 @@ def test_concurrent_builds_translations(self):
             )
         assert (True, 4, 4) == Build.objects.concurrent(translation)
         assert (True, 4, 4) == Build.objects.concurrent(project)
+
+    def test_concurrent_builds_organization(self):
+        organization = fixture.get(
+            Organization,
+            max_concurrent_builds=None,
+        )
+
+        for _ in range(2):
+            project = fixture.get(
+                Project,
+                max_concurrent_builds=None,
+                main_language_project=None,
+            )
+            organization.projects.add(project)
+
+        for project in organization.projects.all():
+            for state in ('triggered', 'building', 'cloning', 'finished'):
+                fixture.get(
+                    Build,
+                    project=project,
+                    state=state,
+                )
+
+        project = organization.projects.first()
+        assert (True, 4, 4) == Build.objects.concurrent(project)
+        for state in ('building', 'cloning'):
+            fixture.get(
+                Build,
+                project=project,
+                state=state,
+            )
+        assert (True, 6, 4) == Build.objects.concurrent(project)
+
+    def test_concurrent_builds_organization_limited(self):
+        organization = fixture.get(
+            Organization,
+            max_concurrent_builds=10,
+        )
+        project_with_builds = fixture.get(
+            Project,
+            max_concurrent_builds=None,
+            main_language_project=None,
+        )
+        project_without_builds = fixture.get(
+            Project,
+            max_concurrent_builds=None,
+            main_language_project=None,
+        )
+        organization.projects.add(project_with_builds)
+        organization.projects.add(project_without_builds)
+        for state in ('triggered', 'building', 'cloning', 'finished'):
+            fixture.get(
+                Build,
+                project=project_with_builds,
+                state=state,
+            )
+        # Calling it with ``project_without_builds`` should count the builds
+        # from ``project_with_builds`` as well
+        assert (False, 2, 10) == Build.objects.concurrent(project_without_builds)
+
+    def test_concurrent_builds_organization_and_project_limited(self):
+        organization = fixture.get(
+            Organization,
+            max_concurrent_builds=10,
+        )
+        project_limited = fixture.get(
+            Project,
+            max_concurrent_builds=2,
+            main_language_project=None,
+        )
+        project_not_limited = fixture.get(
+            Project,
+            max_concurrent_builds=None,
+            main_language_project=None,
+        )
+        organization.projects.add(project_limited)
+        organization.projects.add(project_not_limited)
+        for state in ('triggered', 'building', 'cloning', 'finished'):
+            fixture.get(
+                Build,
+                project=project_limited,
+                state=state,
+            )
+        assert (True, 2, 2) == Build.objects.concurrent(project_limited)
+        assert (False, 2, 10) == Build.objects.concurrent(project_not_limited)

readthedocs/organizations/migrations/0004_organization_max_concurrent_builds.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.16 on 2020-09-17 09:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organizations', '0003_team_auto_join_email_users'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='organization',
+            name='max_concurrent_builds',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Maximum concurrent builds allowed for this organization'),
+        ),
+    ]

readthedocs/organizations/models.py

@@ -69,6 +69,11 @@ class Organization(models.Model):
         help_text='Docs and builds are disabled for this organization',
         default=False,
     )
+    max_concurrent_builds = models.IntegerField(
+        _('Maximum concurrent builds allowed for this organization'),
+        null=True,
+        blank=True,
+    )
 
     stripe_id = models.CharField(
         _('Stripe customer ID'),