Skip to content

PBTree: Fix deadlock when segment deleted #11828

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
MarcosZyk merged 1 commit into from
Jan 3, 2024
Merged

PBTree: Fix deadlock when segment deleted #11828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...b/db/schemaengine/schemaregion/mtree/impl/pbtree/schemafile/pagemgr/BTreePageManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,8 @@ public void delete(ICachedMNode node) throws IOException, MetadataException {
tarPage.getAsSegmentedPage().deleteSegment(getSegIndex(delSegAddr));
if (tarPage.getAsSegmentedPage().validSegments() == 0) {
tarPage.getAsSegmentedPage().purgeSegments();
cxt.indexBuckets.sortIntoBucket(tarPage, (short) -1);
}
cxt.indexBuckets.sortIntoBucket(tarPage, (short) -1);
}

if (tarPage.getAsInternalPage() != null) {
Expand Down
6 changes: 4 additions & 2 deletions .../iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/schemafile/pagemgr/PageManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,14 +298,14 @@ protected void entrantLock(ICachedMNode node, SchemaPageContext cxt)
return;
}

if (minPageIndex > 0) {
if (minPageIndex >= 0) {
page = getPageInstance(minPageIndex, cxt);
page.getLock().writeLock().lock();
cxt.traceLock(page);
cxt.indexBuckets.sortIntoBucket(page, (short) -1);
}

if (minPageIndex != maxPageIndex && maxPageIndex > 0) {
if (minPageIndex != maxPageIndex && maxPageIndex >= 0) {
page = getPageInstance(maxPageIndex, cxt);
page.getLock().writeLock().lock();
cxt.traceLock(page);
Expand Down Expand Up @@ -398,6 +398,7 @@ private void writeNewChildren(ICachedMNode node, SchemaPageContext cxt)
newPage.transplantSegment(curPage.getAsSegmentedPage(), actSegId, newSegSize);
newPage.write(SchemaFile.getSegIndex(curSegAddr), entry.getKey(), childBuffer);
curPage.getAsSegmentedPage().deleteSegment(actSegId);
cxt.indexBuckets.sortIntoBucket(curPage, (short) -1);

// entrant lock guarantees thread-safe
SchemaFile.setNodeAddress(node, curSegAddr);
Expand Down Expand Up @@ -511,6 +512,7 @@ private void writeUpdatedChildren(ICachedMNode node, SchemaPageContext cxt)
// assign new segment address
curSegAddr = newPage.transplantSegment(curPage.getAsSegmentedPage(), actSegId, newSegSiz);
curPage.getAsSegmentedPage().deleteSegment(actSegId);
cxt.indexBuckets.sortIntoBucket(curPage, (short) -1);

newPage.update(SchemaFile.getSegIndex(curSegAddr), entry.getKey(), childBuffer);
SchemaFile.setNodeAddress(node, curSegAddr);
Expand Down