Skip to content

GH-3431: Ignore incomplete compaction directories when finding TDB2 storage #4257

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

Open
Duansg wants to merge 1 commit into
base: main
Choose a base branch
from
Open

GH-3431: Ignore incomplete compaction directories when finding TDB2 storage #4257

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
8 changes: 8 additions & 0 deletions jena-tdb2/src/main/java/org/apache/jena/tdb2/sys/DatabaseOps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ public class DatabaseOps {
// while initializing the area for TDB2 usage in this JVM.
/*package*/ static final String incompleteWIP = "jena-tdb-temp-files";

// EXACT: error on any other "Data*" name except for compaction temporary directories.
// SKIP: ignore other names.
private enum ScanAccept { EXACT, SKIP }

/**
Expand Down Expand Up @@ -531,11 +533,17 @@ private static List<Path> scanForDirByPattern(Path directory, String namebase, S
Pattern pattern = Pattern.compile(Pattern.quote(namebase)+
Pattern.quote(nameSep)+
trailerPattern);
// Left behind by an incomplete compaction; removed when the database is next connected.
Pattern tmpPattern = Pattern.compile(Pattern.quote(namebase)+
Pattern.quote(nameSep)+
dbTmpPattern);
List<Path> paths = new ArrayList<>();
try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory, namebase + "*")) {
for ( Path entry : stream ) {
String filename = entry.getFileName().toString();
if ( !pattern.matcher(filename).matches() ) {
if ( tmpPattern.matcher(filename).matches() )
continue;
switch ( skipOthers ) {
case EXACT: throw new DBOpEnvException("Invalid filename for matching: "+entry.getFileName());
case SKIP: continue;
Expand Down
23 changes: 23 additions & 0 deletions jena-tdb2/src/test/java/org/apache/jena/tdb2/sys/TestDatabaseCompact.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,4 +337,27 @@ private void compact_prefixes_3_test() {
assertFalse(Files.exists(pathFile2));
assertFalse(Files.exists(pathTmp2));
}

@Test public void compact_recovery_2() throws IOException {
DatasetGraph dsg = DatabaseMgr.connectDatasetGraph(dir);
Txn.executeWrite(dsg, ()->dsg.add(quad1));

DatasetGraphSwitchable dsgs = (DatasetGraphSwitchable)dsg;
Path containerPath = dsgs.getContainerPath();
Path storagePath = DatabaseOps.findStorageLocation(containerPath);
assertNotNull(storagePath);

// Mock an incomplete compaction.
Path pathTmp = containerPath.resolve("Data-0002-tmp");
Files.createDirectory(pathTmp);
TDBInternal.expel(dsg);

// Before reconnecting (which cleans up) - e.g. Fuseki checking the database.
assertEquals(storagePath, DatabaseOps.findStorageLocation(containerPath));
assertEquals(storagePath, DatabaseOps.findStorageLocation(dir));

DatasetGraph dsg2 = DatabaseMgr.connectDatasetGraph(dir);
Txn.executeRead(dsg2, ()->assertTrue(dsg2.contains(quad1)));
assertFalse(Files.exists(pathTmp));
}
}
Loading