hatchet-dev · grutt · Jun 4, 2024 · May 29, 2024 · May 29, 2024 · May 29, 2024
diff --git a/api/v1/server/oas/transformers/worker.go b/api/v1/server/oas/transformers/worker.go
@@ -18,12 +18,6 @@ func ToWorker(worker *db.WorkerModel) *gen.Worker {
 		dispatcherUuid = uuid.MustParse(id)
 	}
 
-	var maxRuns int
-
-	if runs, ok := worker.MaxRuns(); ok {
-		maxRuns = runs
-	}
-
 	status := gen.ACTIVE
 
 	if lastHeartbeat, ok := worker.LastHeartbeatAt(); ok && lastHeartbeat.Add(4*time.Second).Before(time.Now()) {
@@ -35,7 +29,7 @@ func ToWorker(worker *db.WorkerModel) *gen.Worker {
 		Name:         worker.Name,
 		DispatcherId: &dispatcherUuid,
 		Status:       &status,
-		MaxRuns:      &maxRuns,
+		MaxRuns:      &worker.MaxRuns,
 	}
 
 	if lastHeartbeatAt, ok := worker.LastHeartbeatAt(); ok {
@@ -46,9 +40,13 @@ func ToWorker(worker *db.WorkerModel) *gen.Worker {
 		res.LastListenerEstablished = &lastListenerEstablished
 	}
 
-	if semaphore, ok := worker.Semaphore(); ok {
-		res.AvailableRuns = &semaphore.Slots
+	numSlots := 0
+	for _, slot := range worker.Slots() {
+		if _, ok := slot.StepRunID(); !ok {
+			numSlots++
+		}
 	}
+	res.AvailableRuns = &numSlots
 
 	if worker.RelationsWorker.Actions != nil {
 		if actions := worker.Actions(); actions != nil {
@@ -69,21 +67,23 @@ func ToWorkerSqlc(worker *dbsqlc.Worker, stepCount *int64, slots *int) *gen.Work
 
 	dispatcherId := uuid.MustParse(pgUUIDToStr(worker.DispatcherId))
 
-	maxRuns := int(worker.MaxRuns.Int32)
+	maxRuns := int(worker.MaxRuns)
 
 	status := gen.ACTIVE
 
 	if worker.LastHeartbeatAt.Time.Add(5 * time.Second).Before(time.Now()) {
 		status = gen.INACTIVE
 	}
 
+	availableRuns := maxRuns - *slots
+
 	res := &gen.Worker{
 		Metadata:      *toAPIMetadata(pgUUIDToStr(worker.ID), worker.CreatedAt.Time, worker.UpdatedAt.Time),
 		Name:          worker.Name,
 		Status:        &status,
 		DispatcherId:  &dispatcherId,
 		MaxRuns:       &maxRuns,
-		AvailableRuns: slots,
+		AvailableRuns: &availableRuns,
 	}
 
 	if !worker.LastHeartbeatAt.Time.IsZero() {

diff --git a/internal/repository/prisma/dbsqlc/models.go b/internal/repository/prisma/dbsqlc/models.go
diff --git a/internal/repository/prisma/dbsqlc/schema.sql b/internal/repository/prisma/dbsqlc/schema.sql
@@ -556,17 +556,20 @@ CREATE TABLE "Worker" (
     "lastHeartbeatAt" TIMESTAMP(3),
     "name" TEXT NOT NULL,
     "dispatcherId" UUID,
-    "maxRuns" INTEGER,
+    "maxRuns" INTEGER NOT NULL DEFAULT 100,
     "isActive" BOOLEAN NOT NULL DEFAULT false,
     "lastListenerEstablished" TIMESTAMP(3),
 
     CONSTRAINT "Worker_pkey" PRIMARY KEY ("id")
 );
 
 -- CreateTable
-CREATE TABLE "WorkerSemaphore" (
+CREATE TABLE "WorkerSemaphoreSlot" (
+    "id" UUID NOT NULL,
     "workerId" UUID N
8000
OT NULL,
-    "slots" INTEGER NOT NULL
+    "stepRunId" UUID,
+
+    CONSTRAINT "WorkerSemaphoreSlot_pkey" PRIMARY KEY ("id")
 );
 
 -- CreateTable
@@ -953,7 +956,13 @@ CREATE UNIQUE INDEX "UserSession_id_key" ON "UserSession"("id" ASC);
 CREATE UNIQUE INDEX "Worker_id_key" ON "Worker"("id" ASC);
 
 -- CreateIndex
-CREATE UNIQUE INDEX "WorkerSemaphore_workerId_key" ON "WorkerSemaphore"("workerId" ASC);
+CREATE UNIQUE INDEX "WorkerSemaphoreSlot_id_key" ON "WorkerSemaphoreSlot"("id" ASC);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "WorkerSemaphoreSlot_stepRunId_key" ON "WorkerSemaphoreSlot"("stepRunId" ASC);
+
+-- CreateIndex
+CREATE INDEX "WorkerSemaphoreSlot_workerId_idx" ON "WorkerSemaphoreSlot"("workerId" ASC);
 
 -- CreateIndex
 CREATE UNIQUE INDEX "Workflow_id_key" ON "Workflow"("id" ASC);
@@ -1235,7 +1244,10 @@ ALTER TABLE "Worker" ADD CONSTRAINT "Worker_dispatcherId_fkey" FOREIGN KEY ("dis
 ALTER TABLE "Worker" ADD CONSTRAINT "Worker_tenantId_fkey" FOREIGN KEY ("tenantId") REFERENCES "Tenant"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
 -- AddForeignKey
-ALTER TABLE "WorkerSemaphore" ADD CONSTRAINT "WorkerSemaphore_workerId_fkey" FOREIGN KEY ("workerId") REFERENCES "Worker"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE "WorkerSemaphoreSlot" ADD CONSTRAINT "WorkerSemaphoreSlot_stepRunId_fkey" FOREIGN KEY ("stepRunId") REFERENCES "StepRun"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "WorkerSemaphoreSlot" ADD CONSTRAINT "WorkerSemaphoreSlot_workerId_fkey" FOREIGN KEY ("workerId") REFERENCES "Worker"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
 -- AddForeignKey
 ALTER TABLE "Workflow" ADD CONSTRAINT "Workflow_tenantId_fkey" FOREIGN KEY ("tenantId") REFERENCES "Tenant"("id") ON DELETE CASCADE ON UPDATE CASCADE;