Skip to content
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

Jump to bottom

rocksdb: commit acquires lock #576

Merged
merged 2 commits into from
Oct 9, 2024
+43 −46
Merged

rocksdb: commit acquires lock #576

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afa1826
commit acquires lock directly
chm-diederichs Oct 2, 2024
2f590a9
check conditions after acquiring lock
chm-diederichs Oct 7, 2024
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
89 changes: 43 additions & 46 deletions lib/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,32 +389,6 @@ class SessionState {
this.mutex.unlock()
}
}

async upgrade (start, end, batch, values, keyPair) {
await this.mutex.lock()

const update = this.createUpdate()

try {
// upsert compat manifest
if (this.core.verifier === null && keyPair) this.core._setManifest(update, null, keyPair)

this.blocks.putBatch(update.batch, start, values)

update.bitfield.setRange(start, end, true)
update.flushTreeBatch(batch)

const bitfield = { start, length: end - start, drop: false }
const status = batch.upgraded ? 0b0001 : 0

update.coreUpdate({ status, bitfield, value: null, from: null })

await this.flushUpdate(update)
} finally {
this._clearActiveBatch()
this.mutex.unlock()
}
}
}

module.exports = class Core {
Expand Down Expand Up @@ -850,37 +824,60 @@ module.exports = class Core {
}

async commit (state, { signature, keyPair = this.header.keyPair, length = state.tree.length, treeLength = state.treeLength } = {}) {
if (this.tree.fork !== state.tree.fork) return null
await this.state.mutex.lock()

if (this.tree.length > state.tree.length) return null // TODO: partial commit in the future if possible
const update = this.state.createUpdate()

if (this.tree.length > treeLength) {
for (const root of this.tree.roots) {
const batchRoot = await state.tree.get(root.index)
if (batchRoot.size !== root.size || !b4a.equals(batchRoot.hash, root.hash)) {
return null
try {
if (this.tree.fork !== state.tree.fork) return null

if (this.tree.length > state.tree.length) return null // TODO: partial commit in the future if possible

if (this.tree.length > treeLength) {
for (const root of this.tree.roots) {
const batchRoot = await state.tree.get(root.index)
if (batchRoot.size !== root.size || !b4a.equals(batchRoot.hash, root.hash)) {
return null
}
}
}
}

const promises = []
const promises = []

const reader = state.storage.createReadBatch()
for (let i = treeLength; i < length; i++) promises.push(reader.getBlock(i))
reader.tryFlush()
const reader = state.storage.createReadBatch()
for (let i = treeLength; i < length; i++) promises.push(reader.getBlock(i))
reader.tryFlush()

const values = await Promise.all(promises)
const values = await Promise.all(promises)

const batch = await this.tree.reconcile(state.tree, length, treeLength)
if (batch.upgraded) batch.signature = signature || this.verifier.sign(batch, keyPair)
const batch = await this.tree.reconcile(state.tree, length, treeLength)
if (batch.upgraded) batch.signature = signature || this.verifier.sign(batch, keyPair)

await this.state.upgrade(treeLength, length, batch, values, keyPair)
// upsert compat manifest
if (this.verifier === null && keyPair) this._setManifest(update, null, keyPair)

state.treeLength = batch.length
this.state.blocks.putBatch(update.batch, treeLength, values)

return {
length: batch.length,
byteLength: batch.byteLength
update.bitfield.setRange(treeLength, length, true)
update.flushTreeBatch(batch)

const bitfield = { start: treeLength, length: length - treeLength, drop: false }
const status = batch.upgraded ? 0b0001 : 0

update.coreUpdate({ status, bitfield, value: null, from: null })

await this.state.flushUpdate(update)

state.treeLength = batch.length

return {
length: batch.length,
byteLength: batch.byteLength
}
} finally {
this.state._clearActiveBatch()
this.updating = false
this.state.mutex.unlock()
}
}

Expand Down
Loading