Skip to content

fix/don't wait if reclaimed tasks > 0 #14

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 16, 2025
Merged

fix/don't wait if reclaimed tasks > 0 #14

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0621bc6
fix: don't wait if reclaimed task > 0
stanley2058 Jan 16, 2025
33f856a
fix: remove unused
stanley2058 Jan 16, 2025
83d2126
fix: worker should process at least wait time
stanley2058 Jan 16, 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
16 changes: 10 additions & 6 deletions src/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import * as math from 'lib0/math'
import * as protocol from './protocol.js'
import * as env from 'lib0/environment'
import * as logging from 'lib0/logging'
import * as time from 'lib0/time'

const logWorker = logging.createModuleLogger('@y/redis/api/worker')
// const logApi = logging.createModuleLogger('@y/redis/api')
Expand Down Expand Up @@ -280,6 +279,7 @@ export class Api {
})
}
tasks.length > 0 && logWorker('Accepted tasks ', { tasks })
let reclaimCounts = 0
await promise.all(tasks.map(async task => {
const streamlen = await this.redis.xLen(task.stream)
if (streamlen === 0) {
Expand All @@ -289,6 +289,7 @@ export class Api {
.exec()
logWorker('Stream still empty, removing recurring task from queue ', { stream: task.stream })
} else {
reclaimCounts++
const { room, docid } = decodeRedisRoomStreamName(task.stream, this.prefix)
const { ydoc, storeReferences, redisLastId } = await this.getDoc(room, docid)
const lastId = math.max(number.parseInt(redisLastId.split('-')[0]), number.parseInt(task.id.split('-')[0]))
Expand Down Expand Up @@ -321,7 +322,7 @@ export class Api {
ydoc.destroy()
}
}))
return tasks
return { tasks, reclaimCounts }
}

async destroy () {
Expand Down Expand Up @@ -353,14 +354,17 @@ export class Worker {
this.client = client
logWorker('Created worker process ', { id: client.consumername, prefix: client.prefix, minMessageLifetime: client.redisMinMessageLifetime })
;(async () => {
const startRedisTime = await client.redis.time()
const timeDiff = startRedisTime.getTime() - time.getUnixTime()
let prev = performance.now()
while (!client._destroyed) {
try {
const tasks = await client.consumeWorkerQueue(opts)
if (tasks.length === 0 || (client.redisMinMessageLifetime > time.getUnixTime() + timeDiff - number.parseInt(tasks[0].id.split('-')[0]))) {
const { reclaimCounts } = await client.consumeWorkerQueue(opts)
const now = performance.now()
if (reclaimCounts === 0) {
await promise.wait(client.redisWorkerTimeout)
} else if (now - prev < client.redisWorkerTimeout) {
await promise.wait(client.redisWorkerTimeout - (now - prev))
}
prev = now
} catch (e) {
console.error(e)
}
Expand Down
Loading