@effect/cluster 0.52.3 → 0.52.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/cluster",
-  "version": "0.52.3",
+  "version": "0.52.5",
   "description": "Unified interfaces for common cluster-specific services",
   "license": "MIT",
   "repository": {
@@ -15,7 +15,7 @@
     "@effect/sql": "^0.48.0",
     "@effect/workflow": "^0.12.2",
     "@effect/rpc": "^0.72.1",
-    "effect": "^3.19.1"
+    "effect": "^3.19.2"
   },
   "publishConfig": {
     "provenance": true

package/src/Sharding.ts

@@ -13,6 +13,7 @@ import * as Either from "effect/Either"
 import * as Equal from "effect/Equal"
 import type * as Exit from "effect/Exit"
 import * as Fiber from "effect/Fiber"
+import * as FiberHandle from "effect/FiberHandle"
 import * as FiberMap from "effect/FiberMap"
 import * as FiberRef from "effect/FiberRef"
 import * as FiberSet from "effect/FiberSet"
@@ -236,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.
@@ -251,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()
 
@@ -281,8 +321,19 @@ const make = Effect.gen(function*() {
           continue
         }
 
-        const acquired = yield* runnerStorage.acquire(selfAddress, unacquiredShards)
-        yield* Effect.ignore(storage.resetShards(acquired))
+        const oacquired = yield* runnerStorage.acquire(selfAddress, unacquiredShards).pipe(
+          Effect.timeoutOption(config.shardLockRefreshInterval)
+        )
+        if (Option.isNone(oacquired)) {
+          activeShardsLatch.unsafeOpen()
+          continue
+        }
+
+        const acquired = oacquired.value
+        yield* storage.resetShards(acquired).pipe(
+          Effect.ignore,
+          Effect.timeoutOption(config.shardLockRefreshInterval)
+        )
         for (const shardId of acquired) {
           if (MutableHashSet.has(releasingShards, shardId) || !MutableHashSet.has(selfShards, shardId)) {
             continue
@@ -308,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`
@@ -347,37 +399,16 @@ const make = Effect.gen(function*() {
       ),
       Effect.repeat(Schedule.fixed(config.shardLockRefreshInterval)),
       Effect.forever,
-      Effect.forkIn(shardingScope)
-    )
-
-    const releaseShardsLock = Effect.unsafeMakeSemaphore(1).withPermits(1)
-    const releaseShards = releaseShardsLock(
-      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 }
-        )
-      )
+      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
     )
   }
 
@@ -542,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.
@@ -669,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
     )
   }
 
@@ -945,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

@@ -242,10 +242,8 @@ export const make = Effect.fnUntraced(function*(options: {
         if (toAcquire.size === 0) {
           return acquiredShardIds
         }
-        const results = (yield* conn.executeUnprepared(`SELECT ${pgLocks(toAcquire)}`, [], undefined))[0] as Record<
-          string,
-          boolean
-        >
+        const rows = yield* conn.executeUnprepared(`SELECT ${pgLocks(toAcquire)}`, [], undefined)
+        const results = rows[0] as Record<string, boolean>
         for (const shardId in results) {
           if (results[shardId]) {
             acquiredShardIds.push(shardId)

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
       }
     )