Skip to content

fix/avoid race condition by preserving room until no connection #26

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 3 commits into from
Jan 25, 2025
Merged

fix/avoid race condition by preserving room until no connection #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c39f90d
feat: use ttl to remove inactive room
stanley2058 Jan 25, 2025
c2dc0e2
fix: don't delete stream if empty
stanley2058 Jan 25, 2025
ac1f004
fix: no need to check for namespace
stanley2058 Jan 25, 2025
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
19 changes: 8 additions & 11 deletions src/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ if (ydocUpdateCallback != null && ydocUpdateCallback.slice(-1) !== '/') {
ydocUpdateCallback += '/'
}
const WORKER_DISABLED = env.getConf('y-worker-disabled') === 'true'
const ROOM_STREAM_TTL = number.parseInt(env.getConf('y-room-stream-ttl') || '300')

/**
* @param {string} a
Expand Down Expand Up @@ -125,14 +126,18 @@ export class Api {
this.persistWorker = null

const addScript = WORKER_DISABLED
? 'redis.call("XADD", KEYS[1], "*", "m", ARGV[1])'
? `
redis.call("XADD", KEYS[1], "*", "m", ARGV[1])
redis.call("EXPIRE", KEYS[1], ${ROOM_STREAM_TTL})
`
: `
if redis.call("EXISTS", KEYS[1]) == 0 then
redis.call("XADD", "${this.redisWorkerStreamName}", "*", "compact", KEYS[1])
elseif redis.call("XLEN", KEYS[1]) > 100 then
redis.call("SADD", "${this.prefix}:worker:checklist", KEYS[1])
end
redis.call("XADD", KEYS[1], "*", "m", ARGV[1])
redis.call("EXPIRE", KEYS[1], ${ROOM_STREAM_TTL})
`

this.redis = redis.createClient({
Expand Down Expand Up @@ -294,20 +299,12 @@ export class Api {
/**
* @param {string} room
* @param {string} docid
* @param {boolean} [remove=false]
*/
async trimRoomStream (room, docid, remove = false) {
async trimRoomStream (room, docid) {
const roomName = computeRedisRoomStreamName(room, docid, this.prefix)
const redisLastId = await this.getRedisLastId(room, docid)
const lastId = number.parseInt(redisLastId.split('-')[0])
if (remove) {
await this.redis.del(roomName)
} else {
await this.redis.multi()
.xTrim(roomName, 'MINID', lastId - this.redisMinMessageLifetime)
.xDelIfEmpty(roomName)
.exec()
}
await this.redis.xTrim(roomName, 'MINID', lastId - this.redisMinMessageLifetime)
}

/**
Expand Down
12 changes: 1 addition & 11 deletions src/y-socket-io/y-socket-io.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,16 +537,7 @@ export class YSocketIO {
await this.client.store.persistDoc(namespace, 'index', doc)
}

/**
* there's a possibility where the namespace is deleted after the
* persist promise resolved, so we have to check if the room still
* exist.
* @see cleanupNamespace
* @see cleanupNamespaceImpl
*/
if (this.namespaceMap.has(namespace)) {
await this.client.trimRoomStream(namespace, 'index')
}
await this.client.trimRoomStream(namespace, 'index')
} catch (e) {
console.error(e)
} finally {
Expand Down Expand Up @@ -687,6 +678,5 @@ export class YSocketIO {
this.namespaceDocMap.get(namespace)?.ydoc.destroy()
this.namespaceDocMap.delete(namespace)
this.namespacePersistentMap.delete(namespace)
this.client?.trimRoomStream(namespace, 'index', true)
}
}
Loading