Rust #325: worker sessions like Server 2.11.1 (#736)

.github/workflows/server-parity.yml

@@ -50,6 +50,8 @@ on:
       - tests/Unit/ServerParityRepairPassContractTest.mjs
       - tests/Unit/ServerParityClusterInfoContractTest.mjs
       - tests/Unit/ServerParityNamespaceDeleteContractTest.mjs
+      - tests/Unit/ServerParityWorkerSessionsContractTest.mjs
+      - tests/Unit/ServerParityWorkerSessionActivitiesContractTest.mjs
       - tests/Unit/ServerParityUpdateValidationContractTest.mjs
       - tests/Unit/ServerParityFixtureSelectionTest.mjs
       - tests/Unit/ServerParityMessageStreamsContractTest.mjs
@@ -1713,7 +1715,7 @@ jobs:
             -e COMPOSER_HOME=/tmp/composer -v "$PWD:/source" -w /source "$image" \
             install --working-dir=scripts/conformance/server-parity --no-interaction --no-progress
           docker run --rm --user=1000:1000 --entrypoint node -v "$PWD:/source:ro" -w /source \
-            "$image" --test tests/Unit/ServerParityRunnerTest.mjs tests/Unit/ServerParitySdkDirectionLanesTest.mjs tests/Unit/ServerParityCooperativeContractTest.mjs tests/Unit/ServerParityChildCancellationContractTest.mjs tests/Unit/ServerParityScheduleContractTest.mjs tests/Unit/ServerParityVisibilityContractTest.mjs tests/Unit/ServerParityAdmissionContractTest.mjs tests/Unit/ServerParityRoleTokenContractTest.mjs tests/Unit/ServerParityWorkerDeregistrationContractTest.mjs tests/Unit/ServerParitySearchAttributeContractTest.mjs tests/Unit/ServerParityWorkerListingContractTest.mjs tests/Unit/ServerParityWorkerReplacementContractTest.mjs tests/Unit/ServerParityPatchDeploymentContractTest.mjs tests/Unit/ServerParityWaitingHistoryContractTest.mjs tests/Unit/ServerParityTaskRetryContractTest.mjs tests/Unit/ServerParityPublishedPatchContractTest.mjs tests/Unit/ServerParityPublishedPatchTransportTest.mjs tests/Unit/ServerParityRecordFileTest.mjs tests/Unit/ServerParityFailureLocationTest.mjs tests/Unit/ServerParityFailureExcerptTest.mjs tests/Unit/ServerParityLateWorkflowCompletionContractTest.mjs tests/Unit/ServerParityStorageTestContractTest.mjs tests/Unit/ServerParitySchedulePoliciesContractTest.mjs tests/Unit/ServerParitySignalsBeforeWorkerContractTest.mjs tests/Unit/ServerParityScheduleCatalogContractTest.mjs tests/Unit/ServerParityOperatorMetricsContractTest.mjs tests/Unit/ServerParityActivityLeaseRenewalContractTest.mjs tests/Unit/ServerParityActivityCancellationAckContractTest.mjs tests/Unit/ServerParityServiceCatalogContractTest.mjs tests/Unit/ServerParitySystemMetricsContractTest.mjs tests/Unit/ServerParityOperatorDashboardTypesContractTest.mjs tests/Unit/ServerParityPrometheusMetricsContractTest.mjs tests/Unit/ServerParityPayloadCleanupContractTest.mjs tests/Unit/ServerParityRepairPassContractTest.mjs tests/Unit/ServerParityClusterInfoContractTest.mjs tests/Unit/ServerParityNamespaceDeleteContractTest.mjs tests/Unit/ServerParityMessageStreamsContractTest.mjs tests/Unit/ServerParityWorkflowPollRequestContractTest.mjs tests/Unit/ServerParityUpdateValidationContractTest.mjs tests/Unit/ServerParityFixtureSelectionTest.mjs > parity-evidence/comparator-tests.txt
+            "$image" --test tests/Unit/ServerParityRunnerTest.mjs tests/Unit/ServerParitySdkDirectionLanesTest.mjs tests/Unit/ServerParityCooperativeContractTest.mjs tests/Unit/ServerParityChildCancellationContractTest.mjs tests/Unit/ServerParityScheduleContractTest.mjs tests/Unit/ServerParityVisibilityContractTest.mjs tests/Unit/ServerParityAdmissionContractTest.mjs tests/Unit/ServerParityRoleTokenContractTest.mjs tests/Unit/ServerParityWorkerDeregistrationContractTest.mjs tests/Unit/ServerParitySearchAttributeContractTest.mjs tests/Unit/ServerParityWorkerListingContractTest.mjs tests/Unit/ServerParityWorkerReplacementContractTest.mjs tests/Unit/ServerParityPatchDeploymentContractTest.mjs tests/Unit/ServerParityWaitingHistoryContractTest.mjs tests/Unit/ServerParityTaskRetryContractTest.mjs tests/Unit/ServerParityPublishedPatchContractTest.mjs tests/Unit/ServerParityPublishedPatchTransportTest.mjs tests/Unit/ServerParityRecordFileTest.mjs tests/Unit/ServerParityFailureLocationTest.mjs tests/Unit/ServerParityFailureExcerptTest.mjs tests/Unit/ServerParityLateWorkflowCompletionContractTest.mjs tests/Unit/ServerParityStorageTestContractTest.mjs tests/Unit/ServerParitySchedulePoliciesContractTest.mjs tests/Unit/ServerParitySignalsBeforeWorkerContractTest.mjs tests/Unit/ServerParityScheduleCatalogContractTest.mjs tests/Unit/ServerParityOperatorMetricsContractTest.mjs tests/Unit/ServerParityActivityLeaseRenewalContractTest.mjs tests/Unit/ServerParityActivityCancellationAckContractTest.mjs tests/Unit/ServerParityServiceCatalogContractTest.mjs tests/Unit/ServerParitySystemMetricsContractTest.mjs tests/Unit/ServerParityOperatorDashboardTypesContractTest.mjs tests/Unit/ServerParityPrometheusMetricsContractTest.mjs tests/Unit/ServerParityPayloadCleanupContractTest.mjs tests/Unit/ServerParityRepairPassContractTest.mjs tests/Unit/ServerParityClusterInfoContractTest.mjs tests/Unit/ServerParityNamespaceDeleteContractTest.mjs tests/Unit/ServerParityMessageStreamsContractTest.mjs tests/Unit/ServerParityWorkflowPollRequestContractTest.mjs tests/Unit/ServerParityUpdateValidationContractTest.mjs tests/Unit/ServerParityFixtureSelectionTest.mjs tests/Unit/ServerParityWorkerSessionsContractTest.mjs tests/Unit/ServerParityWorkerSessionActivitiesContractTest.mjs > parity-evidence/comparator-tests.txt
           docker run --rm --user=1000:1000 --cpus=1 --memory=256m --memory-swap=256m \
             --network=none --entrypoint node -v "$PWD:/source:ro" -w /source \
             "$image" --test tests/Unit/ServerParityCodecDeadlineLoadTest.mjs > parity-evidence/codec-load-tests.txt

app/Http/Controllers/Api/WorkerSessionController.php

@@ -11,6 +11,9 @@
 
 class WorkerSessionController
 {
+    /** The token registration returned, as fenced deregistration accepts it. */
+    private const REGISTRATION_TOKEN_RULES = ['nullable', 'string', 'regex:/^[a-f0-9]{32}$/D'];
+
     public function __construct(
         private readonly WorkerSessionRegistry $sessions,
     ) {}
@@ -52,7 +55,7 @@ public function create(Request $request): JsonResponse
             ], 422);
         }
 
-        $result = $this->sessions->createOrReacquire($namespace, $worker, $options);
+        $result = $this->sessions->createOrReacquire($namespace, $worker, $options, $validated['registration_token'] ?? null);
 
         return WorkerProtocol::json($result, (int) $result['status']);
     }
@@ -71,14 +74,16 @@ public function heartbeat(Request $request, string $sessionId): JsonResponse
 
         $validated = $request->validate([
             'worker_id' => ['required', 'string', 'max:255'],
-            'lease_seconds' => ['nullable', 'integer', 'min:1'],
+            'lease_seconds' => ['nullable', 'integer', 'min:1', 'max:'.WorkerSessionRegistry::MAX_LEASE_SECONDS],
+            'registration_token' => self::REGISTRATION_TOKEN_RULES,
         ]);
 
         $result = $this->sessions->heartbeat(
             $namespace,
             $validated['worker_id'],
             $sessionId,
             $validated['lease_seconds'] ?? null,
+            $validated['registration_token'] ?? null,
         );
 
         return WorkerProtocol::json($result, (int) $result['status']);
@@ -98,9 +103,10 @@ public function close(Request $request, string $sessionId): JsonResponse
 
         $validated = $request->validate([
             'worker_id' => ['required', 'string', 'max:255'],
+            'registration_token' => self::REGISTRATION_TOKEN_RULES,
         ]);
 
-        $result = $this->sessions->close($namespace, $validated['worker_id'], $sessionId);
+        $result = $this->sessions->close($namespace, $validated['worker_id'], $sessionId, $validated['registration_token'] ?? null);
 
         return WorkerProtocol::json($result, (int) $result['status']);
     }
@@ -154,11 +160,12 @@ private function validateSessionRequest(Request $request, bool $workerIdRequired
             'queue' => ['nullable', 'string', 'max:255'],
             'requirements' => ['nullable', 'array'],
             'requirements.*' => ['string', 'max:255'],
-            'lease_seconds' => ['nullable', 'integer', 'min:1'],
-            'ttl_seconds' => ['nullable', 'integer', 'min:1'],
-            'max_concurrent_activities' => ['nullable', 'integer', 'min:1'],
+            'lease_seconds' => ['nullable', 'integer', 'min:1', 'max:'.WorkerSessionRegistry::MAX_LEASE_SECONDS],
+            'ttl_seconds' => ['nullable', 'integer', 'min:1', 'max:'.WorkerSessionRegistry::MAX_TTL_SECONDS],
+            'max_concurrent_activities' => ['nullable', 'integer', 'min:1', 'max:'.WorkerSessionRegistry::MAX_CONCURRENT_ACTIVITIES],
             'create_if_missing' => ['nullable', 'boolean'],
             'allow_reacquire_after_failure' => ['nullable', 'boolean'],
+            'registration_token' => self::REGISTRATION_TOKEN_RULES,
         ]);
     }
 

app/Models/WorkerSessionLease.php

@@ -22,6 +22,7 @@ class WorkerSessionLease extends Model
         'requirements',
         'status',
         'lease_owner',
+        'lease_owner_incarnation',
         'lease_expires_at',
         'ttl_expires_at',
         'closed_at',