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

Issue #4890 trigger leak analysis #5295

Draft
wants to merge 8 commits into
base: develop
Choose a base branch
from
Draft

Issue #4890 trigger leak analysis #5295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
61b0222
Use record for trigger state
reinhapa Apr 30, 2024
3d5bb50
Removed unused methods, no longer use thread local
reinhapa Apr 30, 2024
d7f8acc
Use transaction instead of thread
reinhapa May 9, 2024
8cb7783
Adds mbean server to track trigger states
reinhapa May 14, 2024
728a894
Fixes gone reference handling
reinhapa May 14, 2024
1473c21
Fix missing headers
reinhapa May 14, 2024
490e687
Not remove referenced dqueue values
reinhapa May 27, 2024
f301b5f
Disable triggers during restore
reinhapa May 27, 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
14 changes: 10 additions & 4 deletions exist-core/src/main/java/org/exist/backup/Restore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,11 @@ public void restore(final DBBroker broker, @Nullable final Txn transaction, fina
}

// continue restore
final XMLReaderPool parserPool = broker.getBrokerPool().getParserPool();
final XMLReaderPool parserPool = broker.getBrokerPool().getXmlReaderPool();
final boolean triggersEnabled = broker.isTriggersEnabled();
XMLReader reader = null;
try {
broker.setTriggersEnabled(false);
reader = parserPool.borrowXMLReader();
listener.started(totalNrOfFiles);

Expand All @@ -99,10 +101,14 @@ public void restore(final DBBroker broker, @Nullable final Txn transaction, fina
}

} finally {
listener.finished();
try {
listener.finished();
} finally {
broker.setTriggersEnabled(triggersEnabled);

if (reader != null) {
parserPool.returnXMLReader(reader);
if (reader != null) {
parserPool.returnXMLReader(reader);
}
}
}
}
Expand Down
Loading
Loading