Skip to content

Introduce max_parallel_running_workspaces for orgs #20448

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.

Sign up for GitHub

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

Merged
merged 11 commits into from
Dec 16, 2024
Merged

Introduce max_parallel_running_workspaces for orgs #20448

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cd5d325
Introduce `max_parallel_running_workspaces` for orgs
filiptronicek Dec 13, 2024
9ddf926
Add migration
filiptronicek Dec 13, 2024
6463197
Add UI and org settings server changes
filiptronicek Dec 13, 2024
2ebdf30
Rough edges
filiptronicek Dec 13, 2024
7188a5c
Number inputs (:trollface:)
filiptronicek Dec 13, 2024
969c030
Move LazyOrganizationService to UBP entitlement service to get rid of…
filiptronicek Dec 13, 2024
5474c7d
Fix tests
filiptronicek Dec 16, 2024
37dd291
Update components/gitpod-db/src/typeorm/entity/db-team-settings.ts
filiptronicek Dec 16, 2024
ea621ca
Rename `isPaidPlan` to `isPaidOrDedicated` and get rid of `update_max…
filiptronicek Dec 16, 2024
748421d
Update components/server/src/workspace/workspace-service.ts
filiptronicek Dec 16, 2024
1abd308
Deduplicate instance counting logic
filiptronicek Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/server/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Licensed under the GNU Affero General Public License (AGPL).
# See License.AGPL.txt in the project root for license information.

FROM node:18.17.1-slim as builder
FROM node:18.17.1-slim AS builder

# Install Python, make, gcc and g++ for node-gyp
RUN apt-get update && \
Expand Down
7 changes: 6 additions & 1 deletion components/server/src/billing/entitlement-service-ubp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export class EntitlementServiceUBP implements EntitlementService {
? Math.min(planAllowance, maxParallelRunningWorkspaces)
: planAllowance;

const current = (await runningInstances).filter((i) => i.status.phase !== "preparing").length;
const current = await getRunningInstancesCount(runningInstances);
if (current >= max) {
return {
current,
Expand Down Expand Up @@ -143,3 +143,8 @@ export class EntitlementServiceUBP implements EntitlementService {
return hasPaidPlan ? "paid" : "free";
}
}

export const getRunningInstancesCount = async (instancesPromise: Promise<WorkspaceInstance[]>): Promise<number> => {
const instances = await instancesPromise;
return instances.filter((i) => i.status.phase !== "preparing").length;
};
4 changes: 2 additions & 2 deletions components/server/src/billing/entitlement-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { AttributionId } from "@gitpod/gitpod-protocol/lib/attribution";
import { BillingTier } from "@gitpod/gitpod-protocol/lib/protocol";
import { inject, injectable } from "inversify";
import { BillingModes } from "./billing-mode";
import { EntitlementServiceUBP, LazyOrganizationService } from "./entitlement-service-ubp";
import { EntitlementServiceUBP, getRunningInstancesCount, LazyOrganizationService } from "./entitlement-service-ubp";
import { log } from "@gitpod/gitpod-protocol/lib/util/logging";

export interface MayStartWorkspaceResult {
Expand Down Expand Up @@ -123,7 +123,7 @@ export class EntitlementServiceImpl implements EntitlementService {
// we use || here because the default value is 0 and we want to use the default limit if the organization limit is not set
const maxParallelRunningWorkspaces =
organizationSettings.maxParallelRunningWorkspaces || MAX_PARALLEL_WORKSPACES_PAID;
const current = (await runningInstances).filter((i) => i.status.phase !== "preparing").length;
const current = await getRunningInstancesCount(runningInstances);
if (current >= maxParallelRunningWorkspaces) {
return {
hitParallelWorkspaceLimit: {
Expand Down
Loading