@effect/cluster 0.52.4 → 0.52.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/cluster",
-  "version": "0.52.4",
+  "version": "0.52.5",
   "description": "Unified interfaces for common cluster-specific services",
   "license": "MIT",
   "repository": {
@@ -12,10 +12,10 @@
   "homepage": "https://effect.website",
   "peerDependencies": {
     "@effect/platform": "^0.93.0",
-    "@effect/rpc": "^0.72.1",
     "@effect/sql": "^0.48.0",
-    "effect": "^3.19.1",
-    "@effect/workflow": "^0.12.2"
+    "@effect/workflow": "^0.12.2",
+    "@effect/rpc": "^0.72.1",
+    "effect": "^3.19.2"
   },
   "publishConfig": {
     "provenance": true

package/src/Sharding.ts

@@ -237,6 +237,14 @@ const make = Effect.gen(function*() {
     return MutableHashSet.has(acquiredShards, address.shardId)
   }
 
+  yield* Scope.addFinalizer(
+    shardingScope,
+    Effect.logDebug("Shutdown complete").pipe(Effect.annotateLogs({
+      package: "@effect/cluster",
+      module: "Sharding"
+    }))
+  )
+
   // --- Shard acquisition ---
   //
   // Responsible for acquiring and releasing shards from RunnerStorage.
@@ -252,6 +260,37 @@ const make = Effect.gen(function*() {
       return Effect.ignore(runnerStorage.releaseAll(selfAddress))
     })
 
+    const releaseShardsHandle = yield* FiberHandle.make()
+    const releaseShards = Effect.suspend(function loop(): Effect.Effect<void, PersistenceError> {
+      return Effect.flatMap(
+        Effect.forEach(
+          releasingShards,
+          (shardId) =>
+            Effect.forEach(
+              entityManagers.values(),
+              (state) => state.status === "closed" ? Effect.void : state.manager.interruptShard(shardId),
+              { concurrency: "unbounded", discard: true }
+            ).pipe(
+              Effect.andThen(runnerStorage.release(selfAddress, shardId)),
+              Effect.annotateLogs({ runner: selfAddress }),
+              Effect.flatMap(() => {
+                MutableHashSet.remove(releasingShards, shardId)
+                return storage.unregisterShardReplyHandlers(shardId)
+              })
+            ),
+          { concurrency: "unbounded", discard: true }
+        ),
+        () => {
+          if (MutableHashSet.size(releasingShards) === 0) {
+            return Effect.void
+          }
+          return loop()
+        }
+      )
+    }).pipe(
+      FiberHandle.run(releaseShardsHandle, { onlyIfMissing: true })
+    )
+
     yield* Effect.gen(function*() {
       activeShardsLatch.unsafeOpen()
 
@@ -320,7 +359,8 @@ const make = Effect.gen(function*() {
         fiber: "Shard acquisition loop",
         runner: selfAddress
       }),
-      Effect.forkIn(shardingScope)
+      Effect.forkIn(shardingScope),
+      Effect.interruptible
     )
 
     // refresh the shard locks every `shardLockRefreshInterval`
@@ -359,38 +399,16 @@ const make = Effect.gen(function*() {
       ),
       Effect.repeat(Schedule.fixed(config.shardLockRefreshInterval)),
       Effect.forever,
-      Effect.forkIn(shardingScope)
-    )
-
-    const releaseShardsHandle = yield* FiberHandle.make()
-    const releaseShards = Effect.suspend(() =>
-      Effect.forEach(
-        releasingShards,
-        (shardId) =>
-          Effect.forEach(
-            entityManagers.values(),
-            (state) => state.manager.interruptShard(shardId),
-            { concurrency: "unbounded", discard: true }
-          ).pipe(
-            Effect.andThen(runnerStorage.release(selfAddress, shardId)),
-            Effect.annotateLogs({ runner: selfAddress }),
-            Effect.flatMap(() => {
-              MutableHashSet.remove(releasingShards, shardId)
-              return storage.unregisterShardReplyHandlers(shardId)
-            })
-          ),
-        { concurrency: "unbounded", discard: true }
-      )
-    ).pipe(
-      Effect.repeat({ until: () => MutableHashSet.size(releasingShards) === 0 }),
-      FiberHandle.run(releaseShardsHandle, { onlyIfMissing: true })
+      Effect.forkIn(shardingScope),
+      Effect.interruptible
     )
 
     // open the shard latch every poll interval
     yield* activeShardsLatch.open.pipe(
       Effect.delay(config.entityMessagePollInterval),
       Effect.forever,
-      Effect.forkIn(shardingScope)
+      Effect.forkIn(shardingScope),
+      Effect.interruptible
     )
   }
 
@@ -555,14 +573,16 @@ const make = Effect.gen(function*() {
         runner: selfAddress
       }),
       Effect.withUnhandledErrorLogLevel(Option.none()),
-      Effect.forkIn(shardingScope)
+      Effect.forkIn(shardingScope),
+      Effect.interruptible
     )
 
     // open the storage latch every poll interval
     yield* storageReadLatch.open.pipe(
       Effect.delay(config.entityMessagePollInterval),
       Effect.forever,
-      Effect.forkIn(shardingScope)
+      Effect.forkIn(shardingScope),
+      Effect.interruptible
     )
 
     // Resume unprocessed messages for entities that reached a full mailbox.
@@ -682,7 +702,8 @@ const make = Effect.gen(function*() {
           Effect.sync(() => MutableHashMap.remove(entityResumptionState, address))
         ),
       Effect.withUnhandledErrorLogLevel(Option.none()),
-      Effect.forkIn(shardingScope)
+      Effect.forkIn(shardingScope),
+      Effect.interruptible
     )
   }
 
@@ -958,7 +979,8 @@ const make = Effect.gen(function*() {
       fiber: "RunnerStorage sync",
       runner: config.runnerAddress
     }),
-    Effect.forkIn(shardingScope)
+    Effect.forkIn(shardingScope),
+    Effect.interruptible
   )
 
   // --- Clients ---

package/src/SqlRunnerStorage.ts

@@ -447,9 +447,7 @@ export const make = Effect.fnUntraced(function*(options: {
           function*(_address, shardId) {
             const lockNum = lockNumbers.get(shardId)!
             const conn = yield* Resource.get(lockConnRef!)
-            const release = conn.executeRaw(`SELECT pg_advisory_unlock(${lockNum})`, []).pipe(
-              Effect.timeoutOption(Duration.seconds(5))
-            )
+            const release = conn.executeRaw(`SELECT pg_advisory_unlock(${lockNum})`, [])
             const check = conn.executeValues(
               `SELECT 1 FROM pg_locks WHERE locktype = 'advisory' AND granted = true AND pid = pg_backend_pid() AND objid = ${lockNum}`,
               []
@@ -460,7 +458,6 @@ export const make = Effect.fnUntraced(function*(options: {
               if (takenLocks.length === 0) return
             }
           },
-          Effect.timeout(config.shardLockExpiration),
           Effect.onError(() => Resource.refresh(lockConnRef!)),
           Effect.asVoid,
           PersistenceError.refail,
@@ -482,7 +479,6 @@ export const make = Effect.fnUntraced(function*(options: {
               if (takenLocks.length === 0 || takenLocks[0][0] !== 1) return
             }
           },
-          Effect.timeout(config.shardLockExpiration),
           Effect.onError(() => Resource.refresh(lockConnRef!)),
           Effect.asVoid,
           PersistenceError.refail,

package/src/internal/entityManager.ts

@@ -127,7 +127,7 @@ export const make = Effect.fnUntraced(function*<
       () => {
         serverCloseLatches.get(address)?.unsafeOpen()
         serverCloseLatches.delete(address)
-        return Effect.ignore(options.storage.resetAddress(address))
+        return Effect.void
       }
     )