Skip to content

Commit

Permalink
[refactor] Only journal binary files if recovery is enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
@adamretter
adamretter committed May 13, 2016
1 parent efd6918 commit 9341815
Showing 1 changed file with 66 additions and 47 deletions.
113 changes: 66 additions & 47 deletions src/org/exist/storage/NativeBroker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,6 @@ public class NativeBroker extends DBBroker {
COLLECTIONS_DBX_ID, VALUES_DBX_ID, DOM_DBX_ID
};

//private static final String TEMP_FRAGMENT_REMOVE_ERROR = "Could not remove temporary fragment";
// private static final String TEMP_STORE_ERROR = "An error occurred while storing temporary data: ";
private static final String EXCEPTION_DURING_REINDEX = "exception during reindex";
private static final String DATABASE_IS_READ_ONLY = "Database is read-only";

Expand Down Expand Up @@ -184,7 +182,7 @@ public class NativeBroker extends DBBroker {

private final Path dataDir;
private final Path fsDir;
private final Path fsJournalDir;
private final Optional<Path> fsJournalDir;
private int pageSize;

private final byte prepend;
Expand Down Expand Up @@ -223,11 +221,15 @@ public NativeBroker(final BrokerPool pool, final Configuration config) throws EX
throw new EXistException("Cannot make collection filesystem directory: " + fs.toAbsolutePath().toString(), ioe);
}

final Path fsJournal = dataDir.resolve("fs.journal");
try {
this.fsJournalDir = Files.createDirectories(fsJournal);
} catch(final IOException ioe) {
throw new EXistException("Cannot make collection filesystem directory: " + fsJournal.toAbsolutePath().toString(), ioe);
if(pool.isRecoveryEnabled()) {
final Path fsJournal = dataDir.resolve("fs.journal");
try {
this.fsJournalDir = Optional.of(Files.createDirectories(fsJournal));
} catch(final IOException ioe) {
throw new EXistException("Cannot make collection filesystem directory: " + fsJournal.toAbsolutePath().toString(), ioe);
}
} else {
this.fsJournalDir = Optional.empty();
}

nodesCountThreshold = config.getInteger(BrokerPool.PROPERTY_NODES_BUFFER);
Expand Down Expand Up @@ -1283,17 +1285,22 @@ private void moveBinaryFork(final Txn transaction, final Path sourceDir, final C
final Path targetDir = getCollectionFile(getFsDir(), destination.getURI().append(newName), false);
if(Files.exists(sourceDir)) {
if(Files.exists(targetDir)) {
final Path targetDelDir = getCollectionFile(fsJournalDir, transaction, destination.getURI().append(newName), true);
Files.createDirectories(targetDelDir);
Files.move(targetDir, targetDelDir, StandardCopyOption.ATOMIC_MOVE);

if(logManager.isPresent()) {
final Loggable loggable = new RenameBinaryLoggable(this, transaction, targetDir, targetDelDir);
try {
logManager.get().journal(loggable);
} catch (final JournalException e) {
LOG.warn(e.getMessage(), e);
if(fsJournalDir.isPresent()) {
final Path targetDelDir = getCollectionFile(fsJournalDir.get(), transaction, destination.getURI().append(newName), true);
Files.createDirectories(targetDelDir);
Files.move(targetDir, targetDelDir, StandardCopyOption.ATOMIC_MOVE);

if(logManager.isPresent()) {
final Loggable loggable = new RenameBinaryLoggable(this, transaction, targetDir, targetDelDir);
try {
logManager.get().journal(loggable);
} catch (final JournalException e) {
LOG.warn(e.getMessage(), e);
}
}
} else {
FileUtils.delete(targetDir);
}
}
Files.createDirectories(targetDir.getParent());
Expand Down Expand Up @@ -1607,24 +1614,28 @@ public Object start() {

//now that the database has been updated, update the binary collections on disk
final Path fsSourceDir = getCollectionFile(getFsDir(), collection.getURI(), false);
final Path fsTargetDir = getCollectionFile(fsJournalDir, transaction, collection.getURI(), true);
if(fsJournalDir.isPresent()) {
final Path fsTargetDir = getCollectionFile(fsJournalDir.get(), transaction, collection.getURI(), true);

// remove child binary collections
if(Files.exists(fsSourceDir)) {
Files.createDirectories(fsTargetDir.getParent());
// remove child binary collections
if (Files.exists(fsSourceDir)) {
Files.createDirectories(fsTargetDir.getParent());

//TODO(DS) log first, rename second ???
//TODO(DW) not sure a Fatal is required here. Copy and delete maybe?
Files.move(fsSourceDir, fsTargetDir, StandardCopyOption.ATOMIC_MOVE);
//TODO(DS) log first, rename second ???
//TODO(DW) not sure a Fatal is required here. Copy and delete maybe?
Files.move(fsSourceDir, fsTargetDir, StandardCopyOption.ATOMIC_MOVE);

if(logManager.isPresent()) {
final Loggable loggable = new RenameBinaryLoggable(this, transaction, fsSourceDir, fsTargetDir);
try {
logManager.get().journal(loggable);
} catch (final JournalException e) {
LOG.warn(e.getMessage(), e);
if (logManager.isPresent()) {
final Loggable loggable = new RenameBinaryLoggable(this, transaction, fsSourceDir, fsTargetDir);
try {
logManager.get().journal(loggable);
} catch (final JournalException e) {
LOG.warn(e.getMessage(), e);
}
}
}
} else {
FileUtils.delete(fsSourceDir);
}


Expand Down Expand Up @@ -2091,19 +2102,24 @@ private void storeBinaryResource(final Txn transaction, final BinaryDocument blo
final Path binFile = getCollectionFile(getFsDir(), blob.getURI(), true);
final boolean exists = Files.exists(binFile);

final Function<Path, Loggable> fLoggable;
if(exists) {
final Path backupFile = getCollectionFile(fsJournalDir, transaction, blob.getURI(), true);
Files.move(binFile, backupFile, StandardCopyOption.ATOMIC_MOVE);
fLoggable = original -> new UpdateBinaryLoggable(this, transaction, original, backupFile);
final Optional<Function<Path, Loggable>> fLoggable;
if(fsJournalDir.isPresent()) {
if (exists) {
final Path backupFile = getCollectionFile(fsJournalDir.get(), transaction, blob.getURI(), true);
Files.move(binFile, backupFile, StandardCopyOption.ATOMIC_MOVE);
fLoggable = Optional.of(original -> new UpdateBinaryLoggable(this, transaction, original, backupFile));
} else {
fLoggable = Optional.of(original -> new CreateBinaryLoggable(this, transaction, original));
}
} else {
fLoggable = original -> new CreateBinaryLoggable(this, transaction, original);
Files.deleteIfExists(binFile);
fLoggable = Optional.empty();
}

fWriteData.accept(binFile);

if(logManager.isPresent()) {
final Loggable loggable = fLoggable.apply(binFile);
if(logManager.isPresent() && fLoggable.isPresent()) {
final Loggable loggable = fLoggable.get().apply(binFile);
try {
logManager.get().journal(loggable);
} catch (final JournalException e) {
Expand Down Expand Up @@ -2736,17 +2752,20 @@ public void removeBinaryResource(final Txn transaction, final BinaryDocument blo

final Path binFile = getCollectionFile(getFsDir(), blob.getURI(), false);
if(Files.exists(binFile)) {
final Path binBackupFile = getCollectionFile(fsJournalDir, transaction, blob.getURI(), true);
if(fsJournalDir.isPresent()) {
final Path binBackupFile = getCollectionFile(fsJournalDir.get(), transaction, blob.getURI(), true);
Files.move(binFile, binBackupFile, StandardCopyOption.ATOMIC_MOVE);

Files.move(binFile, binBackupFile, StandardCopyOption.ATOMIC_MOVE);

if(logManager.isPresent()) {
final Loggable loggable = new RenameBinaryLoggable(this, transaction, binFile, binBackupFile);
try {
logManager.get().journal(loggable);
} catch (final JournalException e) {
LOG.warn(e.getMessage(), e);
if (logManager.isPresent()) {
final Loggable loggable = new RenameBinaryLoggable(this, transaction, binFile, binBackupFile);
try {
logManager.get().journal(loggable);
} catch (final JournalException e) {
LOG.warn(e.getMessage(), e);
}
}
} else {
Files.delete(binFile);
}
}
removeResourceMetadata(transaction, blob);
Expand Down

0 comments on commit 9341815

Please sign in to comment.